huge patch ahead: reorganizing config entries with automatic conversion

and backwards compatible translation
Sorry, I got a litte tired proof-reading the patch, so their might be
bugs lurking around. I will give it some further examination and
(as necessary) fixing tomorrow.

CVS patchset: 7233
CVS date: 2004/12/12 22:00:47

5 files changed, 33 insertions, 33 deletions

diff --git a/src/audio_out/audio_alsa_out.c b/src/audio_out/audio_alsa_out.c
index 8043993f2..67e2a0cd0 100644
--- a/src/audio_out/audio_alsa_out.c
+++ b/src/audio_out/audio_alsa_out.c
@@ -26,7 +26,7 @@
  * (c) 2001 James Courtier-Dutton <James@superbug.demon.co.uk>
  *
  * 
- * $Id: audio_alsa_out.c,v 1.148 2004/11/30 19:47:03 dsalt Exp $
+ * $Id: audio_alsa_out.c,v 1.149 2004/12/12 22:01:01 mroi Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -339,26 +339,26 @@ static int ao_alsa_open(ao_driver_t *this_gen, uint32_t bits, uint32_t rate, int
   switch (mode) {
   case AO_CAP_MODE_MONO:
     this->num_channels = 1;
-    pcm_device = config->lookup_entry(config, "audio.alsa_default_device")->str_value;
+    pcm_device = config->lookup_entry(config, "audio.device.alsa_default_device")->str_value;
     break;
   case AO_CAP_MODE_STEREO:
     this->num_channels = 2;
-    pcm_device = config->lookup_entry(config, "audio.alsa_front_device")->str_value;
+    pcm_device = config->lookup_entry(config, "audio.device.alsa_front_device")->str_value;
     break;
   case AO_CAP_MODE_4CHANNEL:
     this->num_channels = 4;
-    pcm_device = config->lookup_entry(config, "audio.alsa_surround40_device")->str_value;
+    pcm_device = config->lookup_entry(config, "audio.device.alsa_surround40_device")->str_value;
     break;
   case AO_CAP_MODE_4_1CHANNEL:
   case AO_CAP_MODE_5CHANNEL:
   case AO_CAP_MODE_5_1CHANNEL:
     this->num_channels = 6;
-    pcm_device = config->lookup_entry(config, "audio.alsa_surround51_device")->str_value;
+    pcm_device = config->lookup_entry(config, "audio.device.alsa_surround51_device")->str_value;
     break;
   case AO_CAP_MODE_A52:
   case AO_CAP_MODE_AC5:
     this->num_channels = 2;
-    pcm_device = config->lookup_entry(config, "audio.alsa_a52_device")->str_value;
+    pcm_device = config->lookup_entry(config, "audio.device.alsa_passthrough_device")->str_value;
     break;
   default:
     xprintf (this->class->xine, XINE_VERBOSITY_DEBUG, 
@@ -1096,7 +1096,7 @@ static void ao_alsa_mixer_init(ao_driver_t *this_gen) {
 
   this->mixer.elem = 0; 
   snd_ctl_card_info_alloca(&hw_info);
-  pcm_device = config->lookup_entry(config, "audio.alsa_default_device")->str_value;
+  pcm_device = config->lookup_entry(config, "audio.device.alsa_default_device")->str_value;
   if ((err = snd_ctl_open (&ctl_handle, pcm_device, 0)) < 0) {
     xprintf (this->class->xine, XINE_VERBOSITY_DEBUG, "audio_alsa_out: snd_ctl_open(): %s\n", snd_strerror(err));
     return;
@@ -1226,14 +1226,14 @@ static void ao_alsa_mixer_init(ao_driver_t *this_gen) {
     goto __mixer_found; /* Yes, untrue but... ;-) */
   
   if(!strcmp(this->mixer.name, "PCM")) {
-    config->update_string(config, "audio.alsa_mixer_name", "Master");
+    config->update_string(config, "audio.device.alsa_mixer_name", "Master");
     loop++;
   }
   else {
-    config->update_string(config, "audio.alsa_mixer_name", "PCM");
+    config->update_string(config, "audio.device.alsa_mixer_name", "PCM");
   }
   
-  this->mixer.name = config->lookup_entry(config, "audio.alsa_mixer_name")->str_value;
+  this->mixer.name = config->lookup_entry(config, "audio.device.alsa_mixer_name")->str_value;
   
   goto __again;
 
@@ -1324,7 +1324,7 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da
   snd_pcm_hw_params_alloca(&params);
 
   this->mmap = config->register_bool (config,
-                               "audio.alsa_mmap_enable",
+                               "audio.device.alsa_mmap_enable",
                                0,
                                _("sound card can do mmap"),
                                _("Enable this, if your sound card and alsa driver "
@@ -1334,7 +1334,7 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da
                                10, NULL,
                                NULL);
   pcm_device = config->register_string(config,
-				       "audio.alsa_default_device",
+				       "audio.device.alsa_default_device",
 				       "default",
 				       _("device used for mono output"),
 				       _("xine will use this alsa device to output "
@@ -1343,7 +1343,7 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da
 				       10, NULL,
 				       NULL);
   pcm_device = config->register_string(config,
-				       "audio.alsa_front_device",
+				       "audio.device.alsa_front_device",
 				       "plug:front:default",
 				       _("device used for stereo output"),
 				       _("xine will use this alsa device to output "
@@ -1352,7 +1352,7 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da
 				       10, NULL,
 				       NULL);
   pcm_device = config->register_string(config,
-				       "audio.alsa_surround40_device",
+				       "audio.device.alsa_surround40_device",
 				       "plug:surround40:0",
 				       _("device used for 4-channel output"),
 				       _("xine will use this alsa device to output "
@@ -1362,7 +1362,7 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da
 				       10, NULL,
 				       NULL);
   pcm_device = config->register_string(config,
-				       "audio.alsa_surround51_device",
+				       "audio.device.alsa_surround51_device",
 				       "plug:surround51:0",
 				       _("device used for 5.1-channel output"),
 				       _("xine will use this alsa device to output "
@@ -1372,7 +1372,7 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da
                                        10,  NULL,
 				       NULL);
   pcm_device = config->register_string(config,
-				       "audio.alsa_a52_device",
+				       "audio.device.alsa_passthrough_device",
 				       "iec958:AES0=0x6,AES1=0x82,AES2=0x0,AES3=0x2",
 				       _("device used for 5.1-channel output"),
 				       _("xine will use this alsa device to output "
@@ -1384,7 +1384,7 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da
 				       NULL);
 
   /* Use the default device to open first */
-  pcm_device = config->lookup_entry(config, "audio.alsa_default_device")->str_value;
+  pcm_device = config->lookup_entry(config, "audio.device.alsa_default_device")->str_value;
  
   /*
    * find best device driver/channel
@@ -1421,7 +1421,7 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da
   this->capabilities = 0;
 
   /* for usability reasons, keep this in sync with audio_oss_out.c */
-  speakers = config->register_enum(config, "audio.speaker_arrangement", STEREO,
+  speakers = config->register_enum(config, "audio.output.speaker_arrangement", STEREO,
 			speaker_arrangement,
 			_("speaker arrangement"),
 			_("Select how your speakers are arranged, "
@@ -1518,10 +1518,10 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da
 
   /* Fallback to "default" if device "front" does not exist */
   /* Needed for some very basic sound cards. */
-  pcm_device = config->lookup_entry(config, "audio.alsa_front_device")->str_value;
+  pcm_device = config->lookup_entry(config, "audio.device.alsa_front_device")->str_value;
   err=snd_pcm_open(&this->audio_fd, pcm_device, SND_PCM_STREAM_PLAYBACK, 1); /* NON-BLOCK mode */
   if(err < 0) {
-    config->update_string(config, "audio.alsa_front_device", "default");
+    config->update_string(config, "audio.device.alsa_front_device", "default");
   } else {
     snd_pcm_close (this->audio_fd);
     this->audio_fd=NULL;
@@ -1539,7 +1539,7 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da
   /* printf("audio_alsa_out: capabilities 0x%X\n",this->capabilities); */
 
   this->mixer.name = config->register_string(config,
-                                             "audio.alsa_mixer_name",
+                                             "audio.device.alsa_mixer_name",
                                              "PCM",
                                              _("alsa mixer device"),
                                              _("xine will use this alsa mixer device to change "
diff --git a/src/audio_out/audio_esd_out.c b/src/audio_out/audio_esd_out.c
index 42c1fd3e0..edaf97618 100644
--- a/src/audio_out/audio_esd_out.c
+++ b/src/audio_out/audio_esd_out.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: audio_esd_out.c,v 1.30 2004/04/10 14:53:43 mroi Exp $
+ * $Id: audio_esd_out.c,v 1.31 2004/12/12 22:01:02 mroi Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -531,7 +531,7 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen,
   this->server_sample_rate = server_sample_rate;
   this->audio_fd           = -1;
   this->capabilities       = AO_CAP_MODE_MONO | AO_CAP_MODE_STEREO | AO_CAP_MIXER_VOL | AO_CAP_MUTE_VOL;
-  this->latency            = config->register_range (config, "audio.esd_latency", 0,
+  this->latency            = config->register_range (config, "audio.device.esd_latency", 0,
 						     -30000, 90000,
 						     _("esd audio output latency (adjust a/v sync)"),
 						     _("If you experience audio being not in sync "
diff --git a/src/audio_out/audio_irixal_out.c b/src/audio_out/audio_irixal_out.c
index be0c2c577..ddfb481ba 100644
--- a/src/audio_out/audio_irixal_out.c
+++ b/src/audio_out/audio_irixal_out.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: audio_irixal_out.c,v 1.11 2004/04/10 14:53:43 mroi Exp $
+ * $Id: audio_irixal_out.c,v 1.12 2004/12/12 22:01:02 mroi Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -380,7 +380,7 @@ static void *init_audio_out_plugin (config_values_t *config)
   printf ("  capabilities 0x%X\n",this->capabilities);
  
   /* TODO: anything can change during runtime... move check to the right location */
-  this->gap_tolerance = config->register_range (config, "audio.irixal_gap_tolerance",
+  this->gap_tolerance = config->register_range (config, "audio.device.irixal_gap_tolerance",
 					        DEFAULT_GAP_TOLERANCE, 0, 90000,
 						_("irixal audio output maximum gap length"),
 						_("You can specify the maximum offset between audio "
diff --git a/src/audio_out/audio_oss_out.c b/src/audio_out/audio_oss_out.c
index cd48bad27..7b94ee10a 100644
--- a/src/audio_out/audio_oss_out.c
+++ b/src/audio_out/audio_oss_out.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: audio_oss_out.c,v 1.112 2004/11/23 14:40:23 mroi Exp $
+ * $Id: audio_oss_out.c,v 1.113 2004/12/12 22:01:02 mroi Exp $
  *
  * 20-8-2001 First implementation of Audio sync and Audio driver separation.
  * Copyright (C) 2001 James Courtier-Dutton James@superbug.demon.co.uk
@@ -731,7 +731,7 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da
   xprintf(class->xine, XINE_VERBOSITY_DEBUG, "audio_oss_out: Opening audio device...\n");
 
   /* devname_val is offset used to select auto, /dev/dsp, or /dev/sound/dsp */
-  devname_val = config->register_enum (config, "audio.oss_device_name", 0,
+  devname_val = config->register_enum (config, "audio.device.oss_device_name", 0,
 				       devname_opts,
 				       _("OSS audio device name"),
 				       _("Specifies the base part of the audio device name, "
@@ -740,7 +740,7 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da
 					 "auto detect the corret setting."),
 					10, NULL, NULL);
   /* devname_num is the N in '/dev[/sound]/dsp[N]'. Set to -1 for nothing */
-  devname_num = config->register_num(config, "audio.oss_device_number", -1,
+  devname_num = config->register_num(config, "audio.device.oss_device_number", -1,
 				     _("OSS audio device number, -1 for none"),
 				     _("The full audio device name is created by concatenating the "
 				       "OSS device name and the audio device number.\n"
@@ -751,7 +751,7 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da
 				     10, NULL, NULL);
   if (devname_val == 0) {
     xprintf(class->xine, XINE_VERBOSITY_LOG,
-	    _("audio_oss_out: audio.oss_device_name = auto, probing devs\n"));
+	    _("audio_oss_out: audio.device.oss_device_name = auto, probing devs\n"));
     if ( ! probe_audio_devices(this)) {  /* Returns zero on fail */
       xprintf(class->xine, XINE_VERBOSITY_LOG, 
 	      _("audio_oss_out: Auto probe for audio device failed\n"));
@@ -914,7 +914,7 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da
   }
 
   /* for usability reasons, keep this in sync with audio_alsa_out.c */
-  speakers = config->register_enum(config, "audio.speaker_arrangement", STEREO,
+  speakers = config->register_enum(config, "audio.output.speaker_arrangement", STEREO,
 			speaker_arrangement,
 			_("speaker arrangement"),
 			_("Select how your speakers are arranged, "
@@ -1012,7 +1012,7 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da
     int audio_devs;
     char *parse;
     
-    mixer_num = config->register_num(config, "audio.mixer_number", -1,
+    mixer_num = config->register_num(config, "audio.device.oss_mixer_number", -1,
 				     _("OSS audio mixer number, -1 for none"),
 				     _("The full mixer device name is created by taking the "
 				       "OSS device name, replacing \"dsp\" with \"mixer\" and "
diff --git a/src/audio_out/audio_sun_out.c b/src/audio_out/audio_sun_out.c
index 2b6b146e5..fe5a6078a 100644
--- a/src/audio_out/audio_sun_out.c
+++ b/src/audio_out/audio_sun_out.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: audio_sun_out.c,v 1.39 2004/04/11 15:27:19 mroi Exp $
+ * $Id: audio_sun_out.c,v 1.40 2004/12/12 22:01:02 mroi Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -884,7 +884,7 @@ static ao_driver_t *ao_sun_open_plugin (audio_driver_class_t *class_gen, const v
 
   /* This config entry is security critical, is it really necessary? */
   devname = config->register_string(config,
-				    "audio.sun_audio_device",
+				    "audio.device.sun_audio_device",
 				    audiodev && *audiodev ? audiodev : "/dev/audio",
 				    _("Sun audio device name"),
 				    _("Specifies the file name for the Sun audio device "