Menu
▾
▴
[xine-cvs] CVS: xine-lib/src/xine-engine .cvsignore,1.2,1.3 audio_decoder.c,1.131,1.132 audio_out.c,1.187,1.188 buffer.h,1.144,1.145 configfile.c,1.68,1.69 configfile.h,1.35,1.36 input_rip.c,1.26,1.27 load_plugins.c,1.190,1.191 osd.c,1.66,1.67 video_decoder.c,1.153,1.154 video_out.c,1.213,1.214 vo_scale.c,1.35,1.36 xine.c,1.303,1.304
|
From: Michael R. <mr...@us...> - 2004-12-12 22:01:47
|
Update of /cvsroot/xine/xine-lib/src/xine-engine In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23951/src/xine-engine Modified Files: .cvsignore audio_decoder.c audio_out.c buffer.h configfile.c configfile.h input_rip.c load_plugins.c osd.c video_decoder.c video_out.c vo_scale.c xine.c Log Message: 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. Index: .cvsignore =================================================================== RCS file: /cvsroot/xine/xine-lib/src/xine-engine/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 15 Dec 2002 16:01:14 -0000 1.2 +++ .cvsignore 12 Dec 2004 22:01:30 -0000 1.3 @@ -4,4 +4,4 @@ .deps *.lo *.la -xineintl.h \ No newline at end of file +xineintl.h Index: audio_decoder.c =================================================================== RCS file: /cvsroot/xine/xine-lib/src/xine-engine/audio_decoder.c,v retrieving revision 1.131 retrieving revision 1.132 diff -u -r1.131 -r1.132 --- audio_decoder.c 11 Dec 2004 23:18:02 -0000 1.131 +++ audio_decoder.c 12 Dec 2004 22:01:30 -0000 1.132 @@ -461,7 +461,7 @@ */ 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) " Index: audio_out.c =================================================================== RCS file: /cvsroot/xine/xine-lib/src/xine-engine/audio_out.c,v retrieving revision 1.187 retrieving revision 1.188 diff -u -r1.187 -r1.188 --- audio_out.c 10 Nov 2004 07:45:29 -0000 1.187 +++ audio_out.c 12 Dec 2004 22:01:30 -0000 1.188 @@ -1549,7 +1549,7 @@ 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 @@ 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 @@ "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 @@ "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 @@ 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 @@ 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)) { Index: buffer.h =================================================================== RCS file: /cvsroot/xine/xine-lib/src/xine-engine/buffer.h,v retrieving revision 1.144 retrieving revision 1.145 diff -u -r1.144 -r1.145 --- buffer.h 26 Sep 2004 22:54:52 -0000 1.144 +++ buffer.h 12 Dec 2004 22:01:30 -0000 1.145 @@ -436,7 +436,7 @@ * 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 Index: configfile.c =================================================================== RCS file: /cvsroot/xine/xine-lib/src/xine-engine/configfile.c,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- configfile.c 12 Sep 2004 19:23:36 -0000 1.68 +++ configfile.c 12 Dec 2004 22:01:30 -0000 1.69 @@ -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 @@ *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 @@ 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 @@ while (entry) { + if (!entry->key[0]) + /* deleted key */ + continue; + lprintf ("saving key '%s'\n", entry->key); if (entry->description) Index: configfile.h =================================================================== RCS file: /cvsroot/xine/xine-lib/src/xine-engine/configfile.h,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- configfile.h 26 Sep 2004 22:54:52 -0000 1.35 +++ configfile.h 12 Dec 2004 22:01:31 -0000 1.36 @@ -38,7 +38,7 @@ # include <xine.h> #endif -#define CONFIG_FILE_VERSION 1 +#define CONFIG_FILE_VERSION 2 /* * config entries above this experience Index: input_rip.c =================================================================== RCS file: /cvsroot/xine/xine-lib/src/xine-engine/input_rip.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- input_rip.c 29 Oct 2004 23:11:38 -0000 1.26 +++ input_rip.c 12 Dec 2004 22:01:31 -0000 1.27 @@ -549,9 +549,9 @@ 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; } Index: load_plugins.c =================================================================== RCS file: /cvsroot/xine/xine-lib/src/xine-engine/load_plugins.c,v retrieving revision 1.190 retrieving revision 1.191 diff -u -r1.190 -r1.191 --- load_plugins.c 1 Dec 2004 06:03:46 -0000 1.190 +++ load_plugins.c 12 Dec 2004 22:01:31 -0000 1.191 @@ -113,7 +113,7 @@ 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 @@ 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 Index: osd.c =================================================================== RCS file: /cvsroot/xine/xine-lib/src/xine-engine/osd.c,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- osd.c 27 Oct 2004 23:03:22 -0000 1.66 +++ osd.c 12 Dec 2004 22:01:31 -0000 1.67 @@ -1416,7 +1416,7 @@ 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 " Index: video_decoder.c =================================================================== RCS file: /cvsroot/xine/xine-lib/src/xine-engine/video_decoder.c,v retrieving revision 1.153 retrieving revision 1.154 diff -u -r1.153 -r1.154 --- video_decoder.c 11 Dec 2004 23:18:03 -0000 1.153 +++ video_decoder.c 12 Dec 2004 22:01:31 -0000 1.154 @@ -478,7 +478,7 @@ */ 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) " Index: video_out.c =================================================================== RCS file: /cvsroot/xine/xine-lib/src/xine-engine/video_out.c,v retrieving revision 1.213 retrieving revision 1.214 diff -u -r1.213 -r1.214 --- video_out.c 26 Oct 2004 20:10:20 -0000 1.213 +++ video_out.c 12 Dec 2004 22:01:32 -0000 1.214 @@ -1735,13 +1735,13 @@ } 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."), Index: vo_scale.c =================================================================== RCS file: /cvsroot/xine/xine-lib/src/xine-engine/vo_scale.c,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- vo_scale.c 26 Oct 2004 20:10:25 -0000 1.35 +++ vo_scale.c 12 Dec 2004 22:01:32 -0000 1.36 @@ -389,7 +389,7 @@ 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 @@ "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 @@ "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" Index: xine.c =================================================================== RCS file: /cvsroot/xine/xine-lib/src/xine-engine/xine.c,v retrieving revision 1.303 retrieving revision 1.304 diff -u -r1.303 -r1.304 --- xine.c 24 Nov 2004 15:44:15 -0000 1.303 +++ xine.c 12 Dec 2004 22:01:32 -0000 1.304 @@ -1463,7 +1463,7 @@ * 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 @@ */ 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 " |