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

13 files changed, 237 insertions, 38 deletions

diff --git a/src/xine-engine/.cvsignore b/src/xine-engine/.cvsignore
index 7f2c876b9..01ef3debb 100644
--- a/src/xine-engine/.cvsignore
+++ b/src/xine-engine/.cvsignore
@@ -4,4 +4,4 @@ Makefile.in
 .deps
 *.lo
 *.la
-xineintl.h
\ No newline at end of file
+xineintl.h
diff --git a/src/xine-engine/audio_decoder.c b/src/xine-engine/audio_decoder.c
index c34303a52..99f13df11 100644
--- a/src/xine-engine/audio_decoder.c
+++ b/src/xine-engine/audio_decoder.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_decoder.c,v 1.131 2004/12/11 23:18:02 valtri Exp $
+ * $Id: audio_decoder.c,v 1.132 2004/12/12 22:01:30 mroi Exp $
  *
  *
  * functions that implement audio decoding
@@ -461,7 +461,7 @@ void _x_audio_decoder_init (xine_stream_t *stream) {
      */
     
     num_buffers = stream->xine->config->register_num (stream->xine->config,
-                                                      "audio.num_buffers",
+                                                      "engine.buffers.audio_num_buffers",
                                                       230,
                                                       _("number of audio buffers"),
 						      _("The number of audio buffers (each is 8k in size) "
diff --git a/src/xine-engine/audio_out.c b/src/xine-engine/audio_out.c
index f210eb726..e8c852091 100644
--- a/src/xine-engine/audio_out.c
+++ b/src/xine-engine/audio_out.c
@@ -17,7 +17,7 @@
  * along with self program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: audio_out.c,v 1.187 2004/11/10 07:45:29 tmattern Exp $
+ * $Id: audio_out.c,v 1.188 2004/12/12 22:01:30 mroi Exp $
  *
  * 22-8-2001 James imported some useful AC3 sections from the previous alsa driver.
  *   (c) 2001 Andy Lo A Foe <andy@alsaplayer.org>
@@ -1549,7 +1549,7 @@ static void ao_exit(xine_audio_port_t *this_gen) {
       prop = AO_PROP_PCM_VOL;
     
     vol = this->driver->get_property(this->driver, prop);
-    this->xine->config->update_num(this->xine->config, "audio.mixer_volume", vol);
+    this->xine->config->update_num(this->xine->config, "audio.volume.mixer_volume", vol);
     if(this->driver_open)
       this->driver->close(this->driver);
     this->driver->exit(this->driver);
@@ -1950,7 +1950,7 @@ xine_audio_port_t *_x_ao_new_port (xine_t *xine, ao_driver_t *driver,
   if (!grab_only)
     this->gap_tolerance          = driver->get_gap_tolerance (this->driver);
 
-  this->av_sync_method_conf = config->register_enum(config, "audio.av_sync_method", 0,
+  this->av_sync_method_conf = config->register_enum(config, "audio.synchronization.av_sync_method", 0,
                                                     av_sync_methods,
                                                     _("method to sync audio and video"),
 						    _("When playing audio and video, there are at least "
@@ -1977,9 +1977,9 @@ xine_audio_port_t *_x_ao_new_port (xine_t *xine, ao_driver_t *driver,
 						      "digital passthrough, where audio data is passed to "
 						      "an external decoder in digital form."),
                                                     20, ao_update_av_sync_method, this);
-  config->update_num(config,"audio.av_sync_method",this->av_sync_method_conf);
+  config->update_num(config,"audio.synchronization.av_sync_method",this->av_sync_method_conf);
   
-  this->resample_conf = config->register_enum (config, "audio.resample_mode", 0,
+  this->resample_conf = config->register_enum (config, "audio.synchronization.resample_mode", 0,
 					       resample_modes,
 					       _("enable resampling"),
 					       _("When the sample rate of the decoded audio does not "
@@ -1988,7 +1988,7 @@ xine_audio_port_t *_x_ao_new_port (xine_t *xine, ao_driver_t *driver,
 						 "can select, whether resampling is enabled, disabled or "
 						 "used automatically when necessary."),
 					       20, NULL, NULL);
-  this->force_rate    = config->register_num (config, "audio.force_rate", 0,
+  this->force_rate    = config->register_num (config, "audio.synchronization.force_rate", 0,
 					      _("always resample to this rate (0 to disable)"),
 					      _("Some audio drivers do not correctly announce the "
 						"capabilities of the audio hardware. By setting a "
@@ -1997,7 +1997,7 @@ xine_audio_port_t *_x_ao_new_port (xine_t *xine, ao_driver_t *driver,
 					      20, NULL, NULL);
 
   this->passthrough_offset = config->register_num (config,
-						   "audio.passthrough_offset",
+						   "audio.synchronization.passthrough_offset",
 						   0,
 						   _("offset for digital passthrough"),
 						   _("If you use an external surround decoder and "
@@ -2069,11 +2069,11 @@ xine_audio_port_t *_x_ao_new_port (xine_t *xine, ao_driver_t *driver,
   if(this->driver){
     int vol;
     
-    vol = config->register_range (config, "audio.mixer_volume", 
+    vol = config->register_range (config, "audio.volume.mixer_volume", 
 				  50, 0, 100, _("startup audio volume"), 
 				  _("The overall audio volume set at xine startup."), 10, NULL, NULL);
     
-    if(config->register_bool (config, "audio.remember_volume", 0,
+    if(config->register_bool (config, "audio.volume.remember_volume", 0,
 			      _("restore volume level at startup"), 
 			      _("If disabled, xine will not modify any mixer settings at startup."),
 			      10, NULL, NULL)) {
diff --git a/src/xine-engine/buffer.h b/src/xine-engine/buffer.h
index 45aceb43e..cc6278346 100644
--- a/src/xine-engine/buffer.h
+++ b/src/xine-engine/buffer.h
@@ -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: buffer.h,v 1.144 2004/09/26 22:54:52 valtri Exp $
+ * $Id: buffer.h,v 1.145 2004/12/12 22:01:30 mroi Exp $
  *
  *
  * contents:
@@ -436,7 +436,7 @@ struct buf_element_s {
  * decoder_info_ptr[2] = pointer to charset encoding string
  * This is used mostly with subtitle buffers when encoding is
  * known at demuxer level (take precedence over xine config
- * settings such as misc.spu_src_encoding)
+ * settings such as subtitles.separate.src_encoding)
  */
 #define BUF_SPECIAL_CHARSET_ENCODING 7
 
diff --git a/src/xine-engine/configfile.c b/src/xine-engine/configfile.c
index 4f0eeb88d..aeaef78c1 100644
--- a/src/xine-engine/configfile.c
+++ b/src/xine-engine/configfile.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: configfile.c,v 1.68 2004/09/12 19:23:36 mroi Exp $
+ * $Id: configfile.c,v 1.69 2004/12/12 22:01:30 mroi Exp $
  *
  * config object (was: file) management - implementation
  *
@@ -45,16 +45,190 @@
 #include "xineutils.h"
 #include "xine_internal.h"
 
+
+typedef struct {
+  const char *old;
+  const char *new;
+} config_entry_translation_t;
+
+static config_entry_translation_t config_entry_translation[] = {
+  { "audio.a52_pass_through",			"" },
+  { "audio.alsa_a52_device",			"audio.device.alsa_passthrough_device" },
+  { "audio.alsa_default_device",		"audio.device.alsa_default_device" },
+  { "audio.alsa_front_device",			"audio.device.alsa_front_device" },
+  { "audio.alsa_mixer_name",			"audio.device.alsa_mixer_name" },
+  { "audio.alsa_mmap_enable",			"audio.device.alsa_mmap_enable" },
+  { "audio.alsa_surround40_device",		"audio.device.alsa_surround40_device" },
+  { "audio.alsa_surround51_device",		"audio.device.alsa_surround51_device" },
+  { "audio.av_sync_method",			"audio.synchronization.av_sync_method" },
+  { "audio.directx_device",			"" },
+  { "audio.esd_latency",			"audio.device.esd_latency" },
+  { "audio.five_channel",			"" },
+  { "audio.five_lfe_channel",			"" },
+  { "audio.force_rate",				"audio.synchronization.force_rate" },
+  { "audio.four_channel",			"" },
+  { "audio.four_lfe_channel",			"" },
+  { "audio.irixal_gap_tolerance",		"audio.device.irixal_gap_tolerance" },
+  { "audio.mixer_name",				"" },
+  { "audio.mixer_number",			"audio.device.oss_mixer_number" },
+  { "audio.mixer_volume",			"audio.volume.mixer_volume" },
+  { "audio.num_buffers",			"engine.buffers.audio_num_buffers" },
+  { "audio.oss_device_name",			"audio.device.oss_device_name" },
+  { "audio.oss_device_num",			"" },
+  { "audio.oss_device_number",			"audio.device.oss_device_number" },
+  { "audio.oss_pass_through_bug",		"" },
+  { "audio.passthrough_offset",			"audio.synchronization.passthrough_offset" },
+  { "audio.remember_volume",			"audio.volume.remember_volume" },
+  { "audio.resample_mode",			"audio.synchronization.resample_mode" },
+  { "audio.speaker_arrangement",		"audio.output.speaker_arrangement" },
+  { "audio.sun_audio_device",			"audio.device.sun_audio_device" },
+  { "codec.a52_dynrng",				"audio.a52.dynamic_range" },
+  { "codec.a52_level",				"audio.a52.level" },
+  { "codec.a52_surround_downmix",		"audio.a52.surround_downmix" },
+  { "codec.ffmpeg_pp_quality",			"video.processing.ffmpeg_pp_quality" },
+  { "codec.real_codecs_path",			"decoder.external.real_codecs_path" },
+  { "codec.win32_path",				"decoder.external.win32_codecs_path" },
+  { "decoder.%s_priority",			"engine.decoder_priorities.%s" },
+  { "dxr3.alt_play_mode",			"dxr3.playback.alt_play_mode" },
+  { "dxr3.color_interval",			"dxr3.output.keycolor_interval" },
+  { "dxr3.correct_durations",			"dxr3.playback.correct_durations" },
+  { "dxr3.device_number",			"dxr3.device_number" },
+  { "dxr3.devicename",				"" },
+  { "dxr3.enc_add_bars",			"dxr3.encoding.add_bars" },
+  { "dxr3.enc_alt_play_mode",			"dxr3.encoding.alt_play_mode" },
+  { "dxr3.enc_swap_fields",			"dxr3.encoding.swap_fields" },
+  { "dxr3.encoder",				"dxr3.encoding.encoder" },
+  { "dxr3.fame_quality",			"dxr3.encoding.fame_quality" },
+  { "dxr3.keycolor",				"dxr3.output.keycolor" },
+  { "dxr3.lavc_bitrate",			"dxr3.encoding.lavc_bitrate" },
+  { "dxr3.lavc_qmax",				"dxr3.encoding.lavc_qmax" },
+  { "dxr3.lavc_qmin",				"dxr3.encoding.lavc_qmin" },
+  { "dxr3.lavc_quantizer",			"dxr3.encoding.lavc_quantizer" },
+  { "dxr3.preferred_tvmode",			"dxr3.output.tvmode" },
+  { "dxr3.rte_bitrate",				"dxr3.encoding.rte_bitrate" },
+  { "dxr3.scr_priority",			"dxr3.scr_priority" },
+  { "dxr3.shrink_overlay_area",			"dxr3.output.shrink_overlay_area" },
+  { "dxr3.sync_every_frame",			"dxr3.playback.sync_every_frame" },
+  { "dxr3.videoout_mode",			"dxr3.output.mode" },
+  { "input.cdda_cddb_cachedir",			"media.audio_cd.cddb_cachedir" },
+  { "input.cdda_cddb_port",			"media.audio_cd.cddb_port" },
+  { "input.cdda_cddb_server",			"media.audio_cd.cddb_server" },
+  { "input.cdda_device",			"media.audio_cd.device" },
+  { "input.cdda_use_cddb",			"media.audio_cd.use_cddb" },
+  { "input.css_cache_path",			"media.dvd.css_cache_path" },
+  { "input.css_decryption_method",		"media.dvd.css_decryption_method" },
+  { "input.drive_slowdown",			"media.audio_cd.drive_slowdown" },
+  { "input.dvb_last_channel_enable",		"media.dvb.remember_channel" },
+  { "input.dvb_last_channel_watched",		"media.dvb.last_channel" },
+  { "input.dvbdisplaychan",			"media.dvb.display_channel" },
+  { "input.dvbzoom",				"media.dvb.zoom" },
+  { "input.dvd_device",				"media.dvd.device" },
+  { "input.dvd_language",			"media.dvd.language" },
+  { "input.dvd_raw_device",			"media.dvd.raw_device" },
+  { "input.dvd_region",				"media.dvd.region" },
+  { "input.dvd_seek_behaviour",			"media.dvd.seek_behaviour" },
+  { "input.dvd_skip_behaviour",			"media.dvd.skip_behaviour" },
+  { "input.dvd_use_readahead",			"media.dvd.readahead" },
+  { "input.file_hidden_files",			"media.files.show_hidden_files" },
+  { "input.file_origin_path",			"media.files.origin_path" },
+  { "input.http_proxy_host",			"media.network.http_proxy_host" },
+  { "input.http_proxy_password",		"media.network.http_proxy_password" },
+  { "input.http_proxy_port",			"media.network.http_proxy_port" },
+  { "input.http_proxy_user",			"media.network.http_proxy_user" },
+  { "input.mms_network_bandwidth",		"media.network.bandwidth" },
+  { "input.mms_protocol",			"media.network.mms_protocol" },
+  { "input.pvr_device",				"media.wintv_pvr.device" },
+  { "input.v4l_radio_device_path",		"media.video4linux.radio_device" },
+  { "input.v4l_video_device_path",		"media.video4linux.video_device" },
+  { "input.vcd_device",				"media.vcd.device" },
+  { "misc.cc_center",				"subtitles.closedcaption.center" },
+  { "misc.cc_enabled",				"subtitles.closedcaption.enabled" },
+  { "misc.cc_font",				"subtitles.closedcaption.font" },
+  { "misc.cc_font_size",			"subtitles.closedcaption.font_size" },
+  { "misc.cc_italic_font",			"subtitles.closedcaption.italic_font" },
+  { "misc.cc_scheme",				"subtitles.closedcaption.scheme" },
+  { "misc.demux_strategy",			"engine.demux.strategy" },
+  { "misc.memcpy_method",			"engine.performance.memcpy_method" },
+  { "misc.osd_text_palette",			"ui.osd.text_palette" },
+  { "misc.save_dir",				"media.capture.save_dir" },
+  { "misc.spu_font",				"subtitles.separate.font" },
+  { "misc.spu_src_encoding",			"subtitles.separate.src_encoding" },
+  { "misc.spu_subtitle_size",			"subtitles.separate.subtitle_size" },
+  { "misc.spu_use_unscaled_osd",		"subtitles.separate.use_unscaled_osd" },
+  { "misc.spu_vertical_offset",			"subtitles.separate.vertical_offset" },
+  { "misc.sub_timeout",				"subtitles.separate.timeout" },
+  { "post.goom_csc_method",			"effects.goom.csc_method" },
+  { "post.goom_fps",				"effects.goom.fps" },
+  { "post.goom_height",				"effects.goom.height" },
+  { "post.goom_width",				"effects.goom.width" },
+  { "vcd.autoadvance",				"media.vcd.autoadvance" },
+  { "vcd.autoplay",				"media.vcd.autoplay" },
+  { "vcd.comment_format",			"media.vcd.comment_format" },
+  { "vcd.debug",				"media.vcd.debug" },
+  { "vcd.default_device",			"media.vcd.device" },
+  { "vcd.length_reporting",			"media.vcd.length_reporting" },
+  { "vcd.show_rejected",			"media.vcd.show_rejected" },
+  { "vcd.title_format",				"media.vcd.title_format" },
+  { "video.XV_DOUBLE_BUFFER",			"video.device.xv_double_buffer" },
+  { "video.XV_FILTER",				"video.device.xv_filter" },
+  { "video.deinterlace_method",			"video.output.xv_deinterlace_method" },
+  { "video.disable_exact_osd_alpha_blending",	"video.output.disable_exact_alphablend" },
+  { "video.disable_scaling",			"video.output.disable_scaling" },
+  { "video.fb_device",				"video.device.fb_device" },
+  { "video.fb_gamma",				"video.output.fb_gamma" },
+  { "video.horizontal_position",		"video.output.horizontal_position" },
+  { "video.num_buffers",			"engine.buffers.video_num_buffers" },
+  { "video.opengl_double_buffer",		"video.device.opengl_double_buffer" },
+  { "video.opengl_gamma",			"video.output.opengl_gamma" },
+  { "video.opengl_min_fps",			"video.output.opengl_min_fps" },
+  { "video.opengl_renderer",			"video.output.opengl_renderer" },
+  { "video.pgx32_device",			"video.device.pgx32_device" },
+  { "video.pgx64_brightness",			"video.output.pgx64_brightness" },
+  { "video.pgx64_chromakey_en",			"video.device.pgx64_chromakey_en" },
+  { "video.pgx64_colour_key",			"video.device.pgx64_colour_key" },
+  { "video.pgx64_device",			"" },
+  { "video.pgx64_multibuf_en",			"video.device.pgx64_multibuf_en" },
+  { "video.pgx64_overlay_mode",			"" },
+  { "video.pgx64_saturation",			"video.output.pgx64_saturation" },
+  { "video.sdl_hw_accel",			"video.device.sdl_hw_accel" },
+  { "video.syncfb_default_repeat",		"video.device.syncfb_default_repeat" },
+  { "video.syncfb_device",			"video.device.syncfb_device" },
+  { "video.unichrome_cpu_save",			"video.device.unichrome_cpu_save" },
+  { "video.vertical_position",			"video.output.vertical_position" },
+  { "video.vidix_blue_intensity",		"video.output.vidix_blue_intensity" },
+  { "video.vidix_colour_key_blue",		"video.device.vidix_colour_key_blue" },
+  { "video.vidix_colour_key_green",		"video.device.vidix_colour_key_green" },
+  { "video.vidix_colour_key_red",		"video.device.vidix_colour_key_red" },
+  { "video.vidix_green_intensity",		"video.output.vidix_green_intensity" },
+  { "video.vidix_red_intensity",		"video.output.vidix_red_intensity" },
+  { "video.vidix_use_double_buffer",		"video.device.vidix_double_buffer" },
+  { "video.vidixfb_device",			"video.device.vidixfb_device" },
+  { "video.warn_discarded_threshold",		"engine.performance.warn_discarded_threshold" },
+  { "video.warn_skipped_threshold",		"engine.performance.warn_skipped_threshold" },
+  { "video.xshm_gamma",				"video.output.xshm_gamma" },
+  { "video.xv_autopaint_colorkey",		"video.device.xv_autopaint_colorkey" },
+  { "video.xv_colorkey",			"video.device.xv_colorkey" },
+  { "video.xv_pitch_alignment",			"video.device.xv_pitch_alignment" },
+  { "video.xvmc_more_frames",			"video.device.xvmc_more_frames" },
+  { "video.xvmc_nvidia_color_fix",		"video.device.xvmc_nvidia_color_fix" }
+};
+
+
 static int config_section_enum(const char *sect) {
   static char *known_section[] = {
     "gui",
+    "ui",
     "audio",
     "video",
     "dxr3",
     "input",
+    "media",
     "codec",
-    "post",
     "decoder",
+    "subtitles",
+    "post",
+    "effects",
+    "engine",
     "misc",
     NULL
   };
@@ -178,6 +352,16 @@ static void __config_lookup_entry_int (config_values_t *this, const char *key,
     *prev  = *entry;
     *entry = (*entry)->next;
   }
+  
+  if (!*entry) {
+    /* we did not find a match, maybe this is an old config entry name
+     * trying to translate */
+    unsigned trans;
+    for (trans = 0; !*entry &&
+	 trans < sizeof(config_entry_translation) / sizeof(config_entry_translation[0]); trans++)
+      if (config_entry_translation[trans].new[0] && strcmp(key, config_entry_translation[trans].old) == 0)
+        __config_lookup_entry_int(this, config_entry_translation[trans].new, entry, prev);
+  }
 }
 
 
@@ -696,8 +880,19 @@ void xine_config_load (xine_t *xine, const char *filename) {
 	value++;
 
 	if (!(entry = __config_lookup_entry(this, line))) {
+	  const char *key = line;
 	  pthread_mutex_lock(&this->config_lock);
-	  entry = __config_add (this, line, 50);
+	  if (this->current_version < CONFIG_FILE_VERSION) {
+	    /* old config file -> let's see if we have to rename this one */
+	    unsigned trans;
+	    for (trans = 0;
+		 trans < sizeof(config_entry_translation) / sizeof(config_entry_translation[0]); trans++)
+	      if (strcmp(key, config_entry_translation[trans].old) == 0) {
+		key = config_entry_translation[trans].new;
+		break;
+	      }
+	  }
+	  entry = __config_add (this, key, 50);
 	  entry->unknown_value = strdup(value);
 	  pthread_mutex_unlock(&this->config_lock);
 	} else {
@@ -804,6 +999,10 @@ void xine_config_save (xine_t *xine, const char *filename) {
 
     while (entry) {
 
+      if (!entry->key[0])
+        /* deleted key */
+        continue;
+
       lprintf ("saving key '%s'\n", entry->key);
 
       if (entry->description)
diff --git a/src/xine-engine/configfile.h b/src/xine-engine/configfile.h
index 1884f1252..a239ea24d 100644
--- a/src/xine-engine/configfile.h
+++ b/src/xine-engine/configfile.h
@@ -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: configfile.h,v 1.35 2004/09/26 22:54:52 valtri Exp $
+ * $Id: configfile.h,v 1.36 2004/12/12 22:01:31 mroi Exp $
  *
  * config file management
  *
@@ -38,7 +38,7 @@ extern "C" {
 #  include <xine.h>
 #endif
 
-#define CONFIG_FILE_VERSION 1
+#define CONFIG_FILE_VERSION 2
 
 /*
  * config entries above this experience 
diff --git a/src/xine-engine/input_rip.c b/src/xine-engine/input_rip.c
index bd0cbfd7f..c177def3d 100644
--- a/src/xine-engine/input_rip.c
+++ b/src/xine-engine/input_rip.c
@@ -29,7 +29,7 @@
  * - it's possible speeder saving streams in the xine without playing:
  *     xine stream_mrl#save:file.raw\;noaudio\;novideo
  *
- * $Id: input_rip.c,v 1.26 2004/10/29 23:11:38 miguelfreitas Exp $
+ * $Id: input_rip.c,v 1.27 2004/12/12 22:01:31 mroi Exp $
  */
 
 /* TODO:
@@ -549,9 +549,9 @@ input_plugin_t *_x_rip_plugin_get_instance (xine_stream_t *stream, const char *f
 
   if (!stream->xine->save_path[0]) {
     xine_log(stream->xine, XINE_LOG_MSG,
-	     _("input_rip: target directory wasn't specified, please fill out the option 'misc.save_dir'\n"));
+	     _("input_rip: target directory wasn't specified, please fill out the option 'media.capture.save_dir'\n"));
     _x_message(stream, XINE_MSG_SECURITY,
-	       _("The stream save feature is disabled until you set misc.save_dir in the configuration."), NULL);
+	       _("The stream save feature is disabled until you set media.capture.save_dir in the configuration."), NULL);
     return NULL;
   }
 
diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c
index df3e9bf7c..ac76ae0d7 100644
--- a/src/xine-engine/load_plugins.c
+++ b/src/xine-engine/load_plugins.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: load_plugins.c,v 1.190 2004/12/01 06:03:46 athp Exp $
+ * $Id: load_plugins.c,v 1.191 2004/12/12 22:01:31 mroi Exp $
  *
  *
  * Load input/demux/audio_out/video_out/codec plugins
@@ -113,7 +113,7 @@ static int get_decoder_priority(xine_t *this, plugin_node_t *node) {
   cfg_entry_t *entry;
   char key[80];
 
-  sprintf(key, "decoder.%s_priority", node->info->id);
+  sprintf(key, "engine.decoder_priorities.%s", node->info->id);
   
   entry = this->config->lookup_entry(this->config, key);
   
@@ -362,7 +362,7 @@ static void _insert_plugin (xine_t *this,
     decoder_new->supported_types = types;
     priority = decoder_new->priority = decoder_old->priority;
     
-    sprintf(key, "decoder.%s_priority", info->id);
+    sprintf(key, "engine.decoder_priorities.%s", info->id);
     sprintf(desc, _("priority for %s decoder"), info->id);
     /* write the description on the heap because the config system
      * does not strdup() it, so we have to provide a different pointer
diff --git a/src/xine-engine/osd.c b/src/xine-engine/osd.c
index 79c870fe4..17f09c2c5 100644
--- a/src/xine-engine/osd.c
+++ b/src/xine-engine/osd.c
@@ -1416,7 +1416,7 @@ osd_renderer_t *_x_osd_renderer_init( xine_stream_t *stream ) {
   osd_preload_fonts (this, str);
 
   this->textpalette = this->stream->xine->config->register_enum (this->stream->xine->config,
-                                             "misc.osd_text_palette", 0,
+                                             "ui.osd.text_palette", 0,
                                              textpalettes_str, 
                                              _("palette (foreground-border-background) to use for subtitles and OSD"),
                                              _("The palette for on-screen-display and some subtitle formats that do "
diff --git a/src/xine-engine/video_decoder.c b/src/xine-engine/video_decoder.c
index 21aa51bb9..a8a009a92 100644
--- a/src/xine-engine/video_decoder.c
+++ b/src/xine-engine/video_decoder.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: video_decoder.c,v 1.153 2004/12/11 23:18:03 valtri Exp $
+ * $Id: video_decoder.c,v 1.154 2004/12/12 22:01:31 mroi Exp $
  *
  */
 
@@ -478,7 +478,7 @@ void _x_video_decoder_init (xine_stream_t *stream) {
      */
   
     num_buffers = stream->xine->config->register_num (stream->xine->config,
-                                                      "video.num_buffers",
+                                                      "engine.buffers.video_num_buffers",
                                                       500,
                                                       _("number of video buffers"),
 						      _("The number of video buffers (each is 8k in size) "
diff --git a/src/xine-engine/video_out.c b/src/xine-engine/video_out.c
index 38c420da3..1c489747e 100644
--- a/src/xine-engine/video_out.c
+++ b/src/xine-engine/video_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: video_out.c,v 1.213 2004/10/26 20:10:20 miguelfreitas Exp $
+ * $Id: video_out.c,v 1.214 2004/12/12 22:01:32 mroi Exp $
  *
  * frame allocation / queuing / scheduling / output functions
  */
@@ -1735,13 +1735,13 @@ xine_video_port_t *_x_vo_new_port (xine_t *xine, vo_driver_t *driver, int grabon
   }
 
   this->warn_skipped_threshold = 
-    xine->config->register_num (xine->config, "video.warn_skipped_threshold", 10,
+    xine->config->register_num (xine->config, "engine.performance.warn_skipped_threshold", 10,
     _("percentage of skipped frames to tolerate"),
     _("When more than this percentage of frames are not shown, because they "
       "were not decoded in time, xine sends a notification."),
     20, NULL, NULL);
   this->warn_discarded_threshold = 
-    xine->config->register_num (xine->config, "video.warn_discarded_threshold", 10,
+    xine->config->register_num (xine->config, "engine.performance.warn_discarded_threshold", 10,
     _("percentage of discarded frames to tolerate"),
     _("When more than this percentage of frames are not shown, because they "
       "were not scheduled for display in time, xine sends a notification."),
diff --git a/src/xine-engine/vo_scale.c b/src/xine-engine/vo_scale.c
index a93c0c08e..1d08cc542 100644
--- a/src/xine-engine/vo_scale.c
+++ b/src/xine-engine/vo_scale.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: vo_scale.c,v 1.35 2004/10/26 20:10:25 miguelfreitas Exp $
+ * $Id: vo_scale.c,v 1.36 2004/12/12 22:01:32 mroi Exp $
  * 
  * Contains common code to calculate video scaling parameters.
  * In short, it will map frame dimensions to screen/window size.
@@ -389,7 +389,7 @@ void _x_vo_scale_init(vo_scale_t *this, int support_zoom, int scaling_disabled,
   this->crop_bottom = 0;
   
   this->output_horizontal_position = 
-    config->register_range(config, "video.horizontal_position", 50, 0, 100,
+    config->register_range(config, "video.output.horizontal_position", 50, 0, 100,
       _("horizontal image position in the output window"),
       _("If the video window's horizontal size is bigger than the actual image "
 	"to show, you can adjust the position where the image will be placed.\n"
@@ -397,7 +397,7 @@ void _x_vo_scale_init(vo_scale_t *this, int support_zoom, int scaling_disabled,
 	"middle\", while 0 means \"at the very left\" and 100 \"at the very right\"."),
       10, vo_scale_horizontal_pos_changed, this) / 100.0;
   this->output_vertical_position =
-    config->register_range(config, "video.vertical_position", 50, 0, 100,
+    config->register_range(config, "video.output.vertical_position", 50, 0, 100,
       _("vertical image position in the output window"),
       _("If the video window's vertical size is bigger than the actual image "
 	"to show, you can adjust the position where the image will be placed.\n"
@@ -405,7 +405,7 @@ void _x_vo_scale_init(vo_scale_t *this, int support_zoom, int scaling_disabled,
 	"middle\", while 0 means \"at the top\" and 100 \"at the bottom\"."),
       10, vo_scale_vertical_pos_changed, this) / 100.0;
   this->scaling_disabled = (scaling_disabled << 1) |
-    config->register_bool(config, "video.disable_scaling", 0,
+    config->register_bool(config, "video.output.disable_scaling", 0,
       _("disable all video scaling"),
       _("If you want the video image to be always shown at its original resolution, "
 	"you can disable all image scaling here.\n"
diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c
index 6cc24cf3d..b3959afbd 100644
--- a/src/xine-engine/xine.c
+++ b/src/xine-engine/xine.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: xine.c,v 1.303 2004/11/24 15:44:15 mroi Exp $
+ * $Id: xine.c,v 1.304 2004/12/12 22:01:32 mroi Exp $
  */
 
 /*
@@ -1463,7 +1463,7 @@ void xine_init (xine_t *this) {
    * content detection strategy
    */
   this->demux_strategy  = this->config->register_enum (
-      this->config, "misc.demux_strategy", 0,
+      this->config, "engine.demux.strategy", 0,
       demux_strategies,
       _("media format detection strategy"),
       _("xine offers various methods to detect the media format of input to play. "
@@ -1483,7 +1483,7 @@ void xine_init (xine_t *this) {
    */
   this->save_path  = this->config->register_string (
       this->config, 
-      "misc.save_dir", "",
+      "media.capture.save_dir", "",
       _("directory for saving streams"),
       _("When using the stream save feature, files will be written only into this directory.\n"
 	"This setting is security critical, because when changed to a different directory, xine "