diff options
77 files changed, 567 insertions, 369 deletions
diff --git a/doc/README.dxr3 b/doc/README.dxr3 index ad0d160c1..db1e97585 100644 --- a/doc/README.dxr3 +++ b/doc/README.dxr3 @@ -129,13 +129,13 @@ audio.driver: set to oss. Can also be specified using "-A oss" on the command line. -audio.oss_device_number: +audio.device.oss_device_number: 0-16 Machines with a dxr3 installed often have a usual soundcard too. If audio playback occurs on the wrong device, the demanded device can be set using this option. -dxr3.decoder_priority: +engine.decoder_priorities.dxr3-mpeg2: 10 Priority of the dxr3 video decoder plugin. <5 means that hardware decoding by the card will be disabled and libmpeg2 will be used instead. Therefore all video @@ -168,7 +168,7 @@ to use the em8300 overlay mechanism. Now, since the xine 0.5 version, it is possible to output the em8300 overlay directly in the video out window. -In order to activate it, "dxr3.videoout_mode" must be set to "overlay". +In order to activate it, "dxr3.output.mode" must be set to "overlay". But it won't work until the old dxr3view works too (just a check). Before a first use, "autocal" has to be run. This will store the right overlay parameters in "~/.overlay". For more information, please consult the @@ -181,10 +181,10 @@ you can run xine with the -H option to auto-hide the vo window, instead of changing the configuration (although you can still do that instead if you prefer, of course). -Have a look at the previous explained configuration options dxr3.keycolor -and dxr3.color_interval too. +Have a look at the previous explained configuration options dxr3.output.keycolor +and dxr3.output.keycolor_interval too. --- version of this file: - $Id: README.dxr3,v 1.10 2004/05/14 13:29:13 mroi Exp $ + $Id: README.dxr3,v 1.11 2004/12/12 22:00:47 mroi Exp $ diff --git a/doc/README.network_dvd b/doc/README.network_dvd index 9d6474211..b64916190 100644 --- a/doc/README.network_dvd +++ b/doc/README.network_dvd @@ -56,7 +56,7 @@ installation for audio cds $ xine cdda://server_address:3000/1 that will play the first track of the CD. in order to use the - GUI button for "CD" you have to change the setting input.cdda_device + GUI button for "CD" you have to change the setting media.audio_cd.device to point to the server. @@ -138,4 +138,4 @@ dvd commands: --- version of this file: - $Id: README.network_dvd,v 1.2 2004/08/02 12:32:30 mroi Exp $ + $Id: README.network_dvd,v 1.3 2004/12/12 22:00:48 mroi Exp $ diff --git a/doc/README_xxmc.html b/doc/README_xxmc.html index 4d6f661d9..531b314ef 100644 --- a/doc/README_xxmc.html +++ b/doc/README_xxmc.html @@ -99,7 +99,7 @@ acceleration correctly.<br> OSD might be rendered in the wrong color with Nvidia chips. To work around this use the xine config option<br> <br> -<span style="font-family: monospace;">video.xvmc_nvidia_color_fix:1<br> +<span style="font-family: monospace;">video.device.xvmc_nvidia_color_fix:1<br> <br> </span>This is due to a bug in the Nvidia XvMC drivers, and this bug is probably also present in the i810 drivers.<br> @@ -113,13 +113,13 @@ not too distant future.<br> If you are running VLD XvMC on the CLE266 there are some options that may affect performance:<br> <br> -<span style="font-family: monospace;">video.unichrome_cpu_save:1</span><br> +<span style="font-family: monospace;">video.device.unichrome_cpu_save:1</span><br> <br> Will save a lot of CPU-power if you are running a 2.6 series kernel. It does this by sleeping while the hardware decoder works. Otherwise it will spend a lot of CPU waiting for decoder completion.<br> <br> -<span style="font-family: monospace;">video.xvmc_more_frames:1</span><br> +<span style="font-family: monospace;">video.device.xvmc_more_frames:1</span><br> <br> Will allocate 15 XvMC surfaces instead of 8. This is very useful if you are using vdr-xine and want to avoid buffer-underrun stutters in xine. diff --git a/doc/faq/faq.sgml b/doc/faq/faq.sgml index 5952072ff..d98504635 100644 --- a/doc/faq/faq.sgml +++ b/doc/faq/faq.sgml @@ -689,7 +689,7 @@ You have a VideoCD with menu at beginning and can see it using an MRL with P1 at the end, but you want to see it by hitting the "VCD" autoscan button as well? Check to see that you have the configuration entry - <parameter>vcd.autoplay</parameter> set to <parameter>playlist</parameter>. + <parameter>media.vcd.autoplay</parameter> set to <parameter>playlist</parameter>. </para> </listitem> </itemizedlist> @@ -699,7 +699,7 @@ <para> To facilitate tracking down problems we let you see what's going on dynamically. Various debugging settings will cause output to appear on xine's plugin log - and/or on standard error output. See the config entry <parameter>vcd.debug</parameter> + and/or on standard error output. See the config entry <parameter>media.vcd.debug</parameter> for details. </para> <para> @@ -738,7 +738,7 @@ The package is called "essential". Unpack it and move everything you find inside to <filename>/usr/lib/win32</filename> (actually you can place them anywhere you want, e.g. someplace in your home directory, but then you'll - have to set <parameter>codec.win32_path</parameter> in your + have to set <parameter>decoder.external.win32_codecs_path</parameter> in your xine config file accordingly). Restart xine then and you should be able to watch Quicktime trailers. </para> @@ -762,10 +762,10 @@ </ulink>. The package is called "essential". Unpack it and move everything you find inside to <filename>/usr/lib/win32</filename> and set the - <parameter>codec.real_codecs_path</parameter> in your xine config file + <parameter>decoder.external.real_codecs_path</parameter> in your xine config file to <filename>/usr/lib/win32</filename> (actually you can place them anywhere you want, e.g. someplace in your home directory, but then you'll - have to set <parameter>codec.real_codecs_path</parameter> accordingly). + have to set <parameter>decoder.external.real_codecs_path</parameter> accordingly). Restart xine then and you should be able to watch Real files/streams. </para> </sect3> @@ -802,7 +802,7 @@ The package is called "essential". Unpack it and move everything you find inside to <filename>/usr/lib/win32</filename> (actually you can place them anywhere you want, e.g. someplace in your home directory, but then you'll - have to set <parameter>codec.win32_path</parameter> in your + have to set <parameter>decoder.external.win32_codecs_path</parameter> in your xine config file accordingly). Restart xine then and you should be able to watch windows media streams. </para> @@ -1051,7 +1051,7 @@ <para> For slow / high-latency dvd drives it might help to increase the number of video buffers xine allocates. Try setting - <parameter>video.num_buffers:500</parameter> + <parameter>engine.buffers.video_num_buffers:500</parameter> to a higher value (e.g. 1000 or 2500). </para> </listitem> @@ -1165,7 +1165,7 @@ <para> If you have a dolby digital (AC3) soundtrack, you can try to enable liba52's dynamic range compression setting - <parameter>codec.a52_dynrng:1</parameter> + <parameter>audio.a52.dynamic_range:1</parameter> in your xine config file (or use some gui config dialog). </para> </listitem> @@ -1207,9 +1207,9 @@ the complicated way by editing the config file yourself which is located in your home directory in <filename>.gxine</filename> or <filename>.xine</filename>: <programlisting> - audio.speaker_arrangement:Surround 4.0 - audio.speaker_arrangement:Surround 4.1 - audio.speaker_arrangement:Surround 5.1</programlisting> + audio.output.speaker_arrangement:Surround 4.0 + audio.output.speaker_arrangement:Surround 4.1 + audio.output.speaker_arrangement:Surround 5.1</programlisting> </para> </sect2> @@ -1220,7 +1220,7 @@ surround (see above). You can either use the config dialog or edit the config file (<filename>~/.xine/config</filename> or <filename>~/.gxine/config</filename>) yourself: - <programlisting> audio.speaker_arrangement:Pass Through</programlisting> + <programlisting> audio.output.speaker_arrangement:Pass Through</programlisting> </para> </sect2> @@ -1328,7 +1328,7 @@ <para> You can either use the config dialog of your frontend or edit the config file (<filename>~/.xine/config</filename>) yourself: - <programlisting> audio.speaker_arrangement:Pass Through</programlisting> + <programlisting> audio.output.speaker_arrangement:Pass Through</programlisting> In case the setting is not in the file you can add it. </para> </sect3> @@ -1389,13 +1389,13 @@ getting out of sync and xine has to compensate. If you see the message only from time to time, you might remedy it by using the resampling sync method. You can do this by setting the configuration entry - <parameter>audio.av_sync_method</parameter> to <parameter>resample</parameter>. + <parameter>audio.synchronization.av_sync_method</parameter> to <parameter>resample</parameter>. </para> <para> If you receive the metronom message more often, maybe switching to different drivers (alsa to oss or vise-versa) can help here. It has also been reported that setting the configuration - entry <parameter>audio.force_rate</parameter> to the native sampling + entry <parameter>audio.synchronization.force_rate</parameter> to the native sampling rate of your soundcard (try 44100 and 48000) helps sometimes. </para> <para> @@ -1750,7 +1750,7 @@ the following settings (<filename>~/.xine/config</filename> or <filename>~/.gxine/config</filename>): <programlisting> gui.osd_use_unscaled:0</programlisting> - <programlisting> misc.spu_use_unscaled_osd:0</programlisting> + <programlisting> subtitles.separate.use_unscaled_osd:0</programlisting> </para> </sect2> @@ -1855,7 +1855,7 @@ </para> <para> The font for text subtitles is selected via config option - <parameter>misc.spu_font</parameter>. You can specify xine font name + <parameter>subtitles.separate.font</parameter>. You can specify xine font name (<parameter>sans</parameter>, <parameter>serif</parameter>, ...) or file name of the TTF font. The directories <filename>$prefix/share/xine/libxine1/fonts</filename> and @@ -1914,7 +1914,7 @@ <para> The encoding of the external subtitles is expected to be iso-8859-1 by default. You need to set an appropriate encoding in the config option - <parameter>misc.spu_src_encoding</parameter>. Note that you also need + <parameter>subtitles.separate.src_encoding</parameter>. Note that you also need a font which contains all characters from the given encoding. </para> <para> diff --git a/doc/hackersguide/internals.sgml b/doc/hackersguide/internals.sgml index 3a3975b3b..9bd1ec684 100644 --- a/doc/hackersguide/internals.sgml +++ b/doc/hackersguide/internals.sgml @@ -384,7 +384,7 @@ mechanism, so a small drift may occur. As the playback goes on this error will accumulate possibly resulting in audio gaps or audio drops. To avoid that annoying effect, two countermeasures are available (switchable with xine config - option <parameter>audio.av_sync_method</parameter>): + option <parameter>audio.synchronization.av_sync_method</parameter>): <itemizedlist> <listitem> <para> diff --git a/doc/internal/README b/doc/internal/README index 323641351..1bce70734 100644 --- a/doc/internal/README +++ b/doc/internal/README @@ -3,4 +3,4 @@ project". These files should not be distributed, not even with released tarballs, as they are only useful in their most recent version, and only for a few core -developers who are supposed to have a CVS tree, anyway...
\ No newline at end of file +developers who are supposed to have a CVS tree, anyway... diff --git a/misc/cdda_server.c b/misc/cdda_server.c index fe3bd1d6a..6c3eb0a6b 100644 --- a/misc/cdda_server.c +++ b/misc/cdda_server.c @@ -15,7 +15,7 @@ * xine cdda://server:3000/1 * * to play the entire cd (using GUI's "CD" button) just change - * input.cdda_device to the server's mrl. + * media.audio_cd.device to the server's mrl. * * 6 May 2003 - Miguel Freitas * This feature was sponsored by 1Control diff --git a/misc/fonts/cetus.ttf b/misc/fonts/cetus.ttf Binary files differindex 0f67d8818..657d0e53e 100644 --- a/misc/fonts/cetus.ttf +++ b/misc/fonts/cetus.ttf @@ -398,8 +398,8 @@ msgstr "" "jméno zvukového zařízení nastaveno na \"auto\"." #: src/audio_out/audio_oss_out.c:754 -msgid "audio_oss_out: audio.oss_device_name = auto, probing devs\n" -msgstr "audio_oss_out: audio.oss_device_name = auto, zkouší se zařízení\n" +msgid "audio_oss_out: audio.device.oss_device_name = auto, probing devs\n" +msgstr "audio_oss_out: audio.device.oss_device_name = auto, zkouší se zařízení\n" #: src/audio_out/audio_oss_out.c:757 msgid "audio_oss_out: Auto probe for audio device failed\n" @@ -4658,14 +4658,14 @@ msgstr "input_rip: vstupní modul není definován!\n" #: src/xine-engine/input_rip.c:552 msgid "" "input_rip: target directory wasn't specified, please fill out the option " -"'misc.save_dir'\n" +"'media.capture.save_dir'\n" msgstr "" "input_rip: cílový adresář nebyl specifikován, prosím vyplňte volbu 'misc." "save_dir'\n" #: src/xine-engine/input_rip.c:554 msgid "" -"The stream save feature is disabled until you set misc.save_dir in the " +"The stream save feature is disabled until you set media.capture.save_dir in the " "configuration." msgstr "" "Vlastnost ukládání dat je zakázána, dokud nenastavíte v konfiguraci 'misc." @@ -408,8 +408,8 @@ msgstr "" "falls OSS Audio-Gerätenamen auf \"auto\" steht." #: src/audio_out/audio_oss_out.c:776 -msgid "audio_oss_out: audio.oss_device_name = auto, probing devs\n" -msgstr "audio_oss_out: audio.oss_device_name = auto, suche Geräte\n" +msgid "audio_oss_out: audio.device.oss_device_name = auto, probing devs\n" +msgstr "audio_oss_out: audio.device.oss_device_name = auto, suche Geräte\n" #: src/audio_out/audio_oss_out.c:779 msgid "audio_oss_out: Auto probe for audio device failed\n" @@ -4571,17 +4571,17 @@ msgstr "input_rip: Input-Plugin nicht definiert!\n" #: src/xine-engine/input_rip.c:545 msgid "" "input_rip: target directory wasn't specified, please fill out the option " -"'misc.save_dir'\n" +"'media.capture.save_dir'\n" msgstr "" -"input_rip: Zielverzeichnis nicht angegeben, bitte die Option 'misc.save_dir' " +"input_rip: Zielverzeichnis nicht angegeben, bitte die Option 'media.capture.save_dir' " "angeben\n" #: src/xine-engine/input_rip.c:547 msgid "" -"The stream save feature is disabled until you set misc.save_dir in the " +"The stream save feature is disabled until you set media.capture.save_dir in the " "configuration." msgstr "" -"Das Abspeichern von Datenströmen ist solange deaktiviert, bis misc.save_dir " +"Das Abspeichern von Datenströmen ist solange deaktiviert, bis media.capture.save_dir " "in der Konfiguration gesetzt ist." #: src/xine-engine/input_rip.c:554 @@ -335,7 +335,7 @@ msgid "" msgstr "" #: src/audio_out/audio_oss_out.c:776 -msgid "audio_oss_out: audio.oss_device_name = auto, probing devs\n" +msgid "audio_oss_out: audio.device.oss_device_name = auto, probing devs\n" msgstr "" #: src/audio_out/audio_oss_out.c:779 @@ -3780,12 +3780,12 @@ msgstr "" #: src/xine-engine/input_rip.c:545 msgid "" "input_rip: target directory wasn't specified, please fill out the option " -"'misc.save_dir'\n" +"'media.capture.save_dir'\n" msgstr "" #: src/xine-engine/input_rip.c:547 msgid "" -"The stream save feature is disabled until you set misc.save_dir in the " +"The stream save feature is disabled until you set media.capture.save_dir in the " "configuration." msgstr "" @@ -342,7 +342,7 @@ msgid "" msgstr "" #: src/audio_out/audio_oss_out.c:776 -msgid "audio_oss_out: audio.oss_device_name = auto, probing devs\n" +msgid "audio_oss_out: audio.device.oss_device_name = auto, probing devs\n" msgstr "" #: src/audio_out/audio_oss_out.c:779 @@ -3780,12 +3780,12 @@ msgstr "" #: src/xine-engine/input_rip.c:545 msgid "" "input_rip: target directory wasn't specified, please fill out the option " -"'misc.save_dir'\n" +"'media.capture.save_dir'\n" msgstr "" #: src/xine-engine/input_rip.c:547 msgid "" -"The stream save feature is disabled until you set misc.save_dir in the " +"The stream save feature is disabled until you set media.capture.save_dir in the " "configuration." msgstr "" @@ -359,8 +359,8 @@ msgstr "" "L'intervallo di questa variabile è -1 o 0-15." #: src/audio_out/audio_oss_out.c:776 -msgid "audio_oss_out: audio.oss_device_name = auto, probing devs\n" -msgstr "audio_oss_out: audio.oss_device_name = auto, si provano i dev\n" +msgid "audio_oss_out: audio.device.oss_device_name = auto, probing devs\n" +msgstr "audio_oss_out: audio.device.oss_device_name = auto, si provano i dev\n" #: src/audio_out/audio_oss_out.c:779 msgid "audio_oss_out: Auto probe for audio device failed\n" @@ -3933,18 +3933,18 @@ msgstr "input_rip: plugin di input non definiti!\n" #: src/xine-engine/input_rip.c:545 msgid "" "input_rip: target directory wasn't specified, please fill out the option " -"'misc.save_dir'\n" +"'media.capture.save_dir'\n" msgstr "" "input_rip: la directory di destinazione non era specificata, riempi " -"l'opzione 'misc.save_dir'\n" +"l'opzione 'media.capture.save_dir'\n" #: src/xine-engine/input_rip.c:547 msgid "" -"The stream save feature is disabled until you set misc.save_dir in the " +"The stream save feature is disabled until you set media.capture.save_dir in the " "configuration." msgstr "" "La caratteristica di salvataggio dello stream è disabilitata finche non si " -"imposta misc.save_dir nella configurazione." +"imposta media.capture.save_dir nella configurazione." #: src/xine-engine/input_rip.c:554 #, fuzzy @@ -353,7 +353,7 @@ msgid "" msgstr "" #: src/audio_out/audio_oss_out.c:776 -msgid "audio_oss_out: audio.oss_device_name = auto, probing devs\n" +msgid "audio_oss_out: audio.device.oss_device_name = auto, probing devs\n" msgstr "" #: src/audio_out/audio_oss_out.c:779 @@ -4043,12 +4043,12 @@ msgstr "" #: src/xine-engine/input_rip.c:545 msgid "" "input_rip: target directory wasn't specified, please fill out the option " -"'misc.save_dir'\n" +"'media.capture.save_dir'\n" msgstr "" #: src/xine-engine/input_rip.c:547 msgid "" -"The stream save feature is disabled until you set misc.save_dir in the " +"The stream save feature is disabled until you set media.capture.save_dir in the " "configuration." msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 10f36aedb..1d07f1614 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -336,7 +336,7 @@ msgid "" msgstr "" #: src/audio_out/audio_oss_out.c:776 -msgid "audio_oss_out: audio.oss_device_name = auto, probing devs\n" +msgid "audio_oss_out: audio.device.oss_device_name = auto, probing devs\n" msgstr "" #: src/audio_out/audio_oss_out.c:779 @@ -3788,12 +3788,12 @@ msgstr "" #: src/xine-engine/input_rip.c:545 msgid "" "input_rip: target directory wasn't specified, please fill out the option " -"'misc.save_dir'\n" +"'media.capture.save_dir'\n" msgstr "" #: src/xine-engine/input_rip.c:547 msgid "" -"The stream save feature is disabled until you set misc.save_dir in the " +"The stream save feature is disabled until you set media.capture.save_dir in the " "configuration." msgstr "" @@ -229,8 +229,8 @@ msgstr "" "nastavte na -1 (eg /dev/sound/dsp). Rozsah čísla je -1 alebo 0-15." #: src/audio_out/audio_oss_out.c:755 -msgid "audio_oss_out: audio.oss_device_name = auto, probing devs\n" -msgstr "audio_oss_out: audio.oss_device_name = auto, skúšam devs\n" +msgid "audio_oss_out: audio.device.oss_device_name = auto, probing devs\n" +msgstr "audio_oss_out: audio.device.oss_device_name = auto, skúšam devs\n" #: src/audio_out/audio_oss_out.c:758 msgid "audio_oss_out: Auto probe for audio device failed\n" @@ -2927,17 +2927,17 @@ msgstr "input_rip: vstupný modul nedefinovaný!\n" #: src/xine-engine/input_rip.c:545 msgid "" "input_rip: target directory wasn't specified, please fill out the option " -"'misc.save_dir'\n" +"'media.capture.save_dir'\n" msgstr "" "input_rip: cieľový adresár nebol špecifikovaný, prosím vyplnte voľbu " -"'misc.save_dir'\n" +"'media.capture.save_dir'\n" #: src/xine-engine/input_rip.c:547 msgid "" -"The stream save feature is disabled until you set misc.save_dir in the " +"The stream save feature is disabled until you set media.capture.save_dir in the " "configuration." msgstr "" -"Schopnosť ukladania je zakázaná dovtedy kým nenastavíte misc.save_dir " +"Schopnosť ukladania je zakázaná dovtedy kým nenastavíte media.capture.save_dir " "v konfigurácii." #: src/xine-engine/input_rip.c:554 diff --git a/po/xine-lib.pot b/po/xine-lib.pot index ac755217d..dc3fc3d81 100644 --- a/po/xine-lib.pot +++ b/po/xine-lib.pot @@ -335,7 +335,7 @@ msgid "" msgstr "" #: src/audio_out/audio_oss_out.c:776 -msgid "audio_oss_out: audio.oss_device_name = auto, probing devs\n" +msgid "audio_oss_out: audio.device.oss_device_name = auto, probing devs\n" msgstr "" #: src/audio_out/audio_oss_out.c:779 @@ -3734,12 +3734,12 @@ msgstr "" #: src/xine-engine/input_rip.c:545 msgid "" "input_rip: target directory wasn't specified, please fill out the option " -"'misc.save_dir'\n" +"'media.capture.save_dir'\n" msgstr "" #: src/xine-engine/input_rip.c:547 msgid "" -"The stream save feature is disabled until you set misc.save_dir in the " +"The stream save feature is disabled until you set media.capture.save_dir in the " "configuration." msgstr "" 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(¶ms); 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 " diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c index a24fb0995..5b75dde2c 100644 --- a/src/demuxers/demux_qt.c +++ b/src/demuxers/demux_qt.c @@ -30,7 +30,7 @@ * build_frame_table * free_qt_info * - * $Id: demux_qt.c,v 1.195 2004/11/13 02:38:15 athp Exp $ + * $Id: demux_qt.c,v 1.196 2004/12/12 22:01:03 mroi Exp $ * */ @@ -2879,7 +2879,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str /* fetch bandwidth config */ this->bandwidth = 0x7FFFFFFFFFFFFFFFLL; /* assume infinite bandwidth */ - if (xine_config_lookup_entry (stream->xine, "input.mms_network_bandwidth", + if (xine_config_lookup_entry (stream->xine, "media.network.bandwidth", &entry)) { if ((entry.num_value >= 0) && (entry.num_value <= 11)) this->bandwidth = bandwidths[entry.num_value]; diff --git a/src/dxr3/dxr3_decode_video.c b/src/dxr3/dxr3_decode_video.c index 3a5cc002c..b04f9a44b 100644 --- a/src/dxr3/dxr3_decode_video.c +++ b/src/dxr3/dxr3_decode_video.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: dxr3_decode_video.c,v 1.57 2004/07/20 16:37:44 mroi Exp $ + * $Id: dxr3_decode_video.c,v 1.58 2004/12/12 22:01:04 mroi Exp $ */ /* dxr3 video decoder plugin. @@ -273,18 +273,18 @@ static video_decoder_t *dxr3_open_plugin(video_decoder_class_t *class_gen, xine_ this->last_vpts = this->class->clock->get_current_time(this->class->clock); this->sync_every_frame = cfg->register_bool(cfg, - "dxr3.sync_every_frame", 0, _("try to sync video every frame"), + "dxr3.playback.sync_every_frame", 0, _("try to sync video every frame"), _("Tries to set a synchronization timestamp for every frame. " "Normally this is not necessary, because sync is sufficent " "even when the timestamp is set only every now and then.\n" "This is relevant for progressive video only (most PAL films)."), 20, dxr3_update_sync_mode, this); this->enhanced_mode = cfg->register_bool(cfg, - "dxr3.alt_play_mode", 1, _("use smooth play mode"), + "dxr3.playback.alt_play_mode", 1, _("use smooth play mode"), _("Enabling this option will utilise a smoother play mode."), 20, dxr3_update_enhanced_mode, this); this->correct_durations = cfg->register_bool(cfg, - "dxr3.correct_durations", 0, _("correct frame durations in broken streams"), + "dxr3.playback.correct_durations", 0, _("correct frame durations in broken streams"), _("Enables a small logic that corrects the frame durations of " "some mpeg streams with wrong framerate codes. Currently a " "correction for NTSC streams erroneously labeled as PAL " diff --git a/src/dxr3/dxr3_mpeg_encoders.c b/src/dxr3/dxr3_mpeg_encoders.c index d0bb58791..3e580d2e7 100644 --- a/src/dxr3/dxr3_mpeg_encoders.c +++ b/src/dxr3/dxr3_mpeg_encoders.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: dxr3_mpeg_encoders.c,v 1.20 2004/07/20 16:37:44 mroi Exp $ + * $Id: dxr3_mpeg_encoders.c,v 1.21 2004/12/12 22:01:04 mroi Exp $ */ /* mpeg encoders for the dxr3 video out plugin. @@ -185,7 +185,7 @@ static int rte_on_update_format(dxr3_driver_t *drv, dxr3_frame_t *frame) } this->rte_bitrate = drv->class->xine->config->register_range(drv->class->xine->config, - "dxr3.rte_bitrate", 10000, 1000, 20000, + "dxr3.encoding.rte_bitrate", 10000, 1000, 20000, _("rte mpeg output bitrate (kbit/s)"), _("The bitrate the mpeg encoder library librte should use for DXR3's encoding mode. " "Higher values will increase quality and CPU usage."), 10, NULL, NULL); @@ -383,7 +383,7 @@ static int fame_on_update_format(dxr3_driver_t *drv, dxr3_frame_t *frame) this->fp = init_fp; this->fp.quality = drv->class->xine->config->register_range(drv->class->xine->config, - "dxr3.fame_quality", 90, 10, 100, + "dxr3.encoding.fame_quality", 90, 10, 100, _("fame mpeg encoding quality"), _("The encoding quality of the libfame mpeg encoder library. " "Lower is faster but gives noticeable artifacts. Higher is better but slower."), @@ -550,7 +550,7 @@ int dxr3_lavc_init(dxr3_driver_t *drv, plugin_node_t *node) ffmpeg = dlopen(node->filename, RTLD_LAZY); if (!ffmpeg) return 0; - init = dlsym(ffmpeg, "dxr3_encoder_init"); + init = dlsym(ffmpeg, "dxr3.encoding.encoder_init"); if (!init) return 0; result = init(drv); diff --git a/src/dxr3/video_out_dxr3.c b/src/dxr3/video_out_dxr3.c index d12afb27a..47dd82b0f 100644 --- a/src/dxr3/video_out_dxr3.c +++ b/src/dxr3/video_out_dxr3.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_dxr3.c,v 1.105 2004/11/24 16:11:02 mroi Exp $ + * $Id: video_out_dxr3.c,v 1.106 2004/12/12 22:01:04 mroi Exp $ */ /* mpeg1 encoding video out plugin for the dxr3. @@ -257,17 +257,17 @@ static vo_driver_t *dxr3_vo_open_plugin(video_driver_class_t *class_gen, const v this->class = class; this->swap_fields = config->register_bool(config, - "dxr3.enc_swap_fields", 0, _("swap odd and even lines"), + "dxr3.encoding.swap_fields", 0, _("swap odd and even lines"), _("Swaps the even and odd field of the image.\nEnable this option for " "non-MPEG material which produces a vertical jitter on screen."), 10, dxr3_update_swap_fields, this); this->add_bars = config->register_bool(config, - "dxr3.enc_add_bars", 1, _("add black bars to correct aspect ratio"), + "dxr3.encoding.add_bars", 1, _("add black bars to correct aspect ratio"), _("Adds black bars when the image has an aspect ratio the card cannot " "handle natively. This is needed to maintain proper image proportions."), 20, dxr3_update_add_bars, this); this->enhanced_mode = config->register_bool(config, - "dxr3.enc_alt_play_mode", 1, + "dxr3.encoding.alt_play_mode", 1, _("use smooth play mode for mpeg encoder playback"), _("Enabling this option will utilise a smoother play mode for non-MPEG content."), 20, dxr3_update_enhanced_mode, this); @@ -326,7 +326,7 @@ static vo_driver_t *dxr3_vo_open_plugin(video_driver_class_t *class_gen, const v printf("none\n"); #endif if (encoder) { - encoder = config->register_enum(config, "dxr3.encoder", 0, + encoder = config->register_enum(config, "dxr3.encoding.encoder", 0, available_encoders, _("encoder for non mpeg content"), _("Content other than MPEG has to pass an additional reencoding stage, " "because the dxr3 handles only MPEG.\nDepending on what is supported by your xine, " @@ -378,7 +378,7 @@ static vo_driver_t *dxr3_vo_open_plugin(video_driver_class_t *class_gen, const v dxr3_set_property(&this->vo_driver, VO_PROP_SATURATION, 500); /* overlay or tvout? */ - confnum = config->register_enum(config, "dxr3.videoout_mode", 0, videoout_modes, + confnum = config->register_enum(config, "dxr3.output.mode", 0, videoout_modes, _("video output mode (TV or overlay)"), _("The way the DXR3 outputs the final video can be set here. The individual values are:\n\n" "letterboxed tv\n" @@ -426,18 +426,18 @@ static vo_driver_t *dxr3_vo_open_plugin(video_driver_class_t *class_gen, const v this->overlay_enabled = 1; this->tv_switchable = 1; this->widescreen_enabled = confnum - 2; - confstr = config->register_string(config, "dxr3.keycolor", "0x80a040", + confstr = config->register_string(config, "dxr3.output.keycolor", "0x80a040", _("overlay colorkey value"), _("Hexadecimal RGB value of the key color.\n" "You can try different values, if you experience windows becoming transparent " "when using DXR3 overlay mode."), 20, NULL, NULL); sscanf(confstr, "%x", &this->overlay.colorkey); - confstr = config->register_string(config, "dxr3.color_interval", "50.0", + confstr = config->register_string(config, "dxr3.output.keycolor_interval", "50.0", _("overlay colorkey tolerance"), _("A greater value widens the tolerance for " "the overlay keycolor.\nYou can try lower values, if you experience windows " "becoming transparent when using DXR3 overlay mode, but parts of the image borders may " "disappear when using a too low setting."), 20, NULL, NULL); sscanf(confstr, "%f", &this->overlay.color_interval); - this->overlay.shrink = config->register_num(config, "dxr3.shrink_overlay_area", 0, + this->overlay.shrink = config->register_num(config, "dxr3.output.shrink_overlay_area", 0, _("crop the overlay area at top and bottom"), _("Removes one pixel line from the top and bottom of the overlay. Enable this, if " "you see green lines at the top or bottom of the overlay."), 10, NULL, NULL); @@ -452,7 +452,7 @@ static vo_driver_t *dxr3_vo_open_plugin(video_driver_class_t *class_gen, const v } /* init tvmode */ - confnum = config->register_enum(config, "dxr3.preferred_tvmode", 3, tv_modes, + confnum = config->register_enum(config, "dxr3.output.tvmode", 3, tv_modes, _("preferred tv mode"), _("Selects the TV mode to be used by the DXR3. The values mean:\n\n" "ntsc: NTSC at 60Hz\npal: PAL at 50Hz\npal60: PAL at 60Hz\ndefault: keep the card's setting"), 0, NULL, NULL); diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c index 9daac2bae..e652ee038 100644 --- a/src/input/input_cdda.c +++ b/src/input/input_cdda.c @@ -20,7 +20,7 @@ * Compact Disc Digital Audio (CDDA) Input Plugin * by Mike Melanson (melanson@pcisys.net) * - * $Id: input_cdda.c,v 1.68 2004/12/12 00:41:22 miguelfreitas Exp $ + * $Id: input_cdda.c,v 1.69 2004/12/12 22:01:05 mroi Exp $ */ #ifdef HAVE_CONFIG_H @@ -1897,7 +1897,7 @@ static int cdda_open(cdda_input_plugin_t *this_gen, if (this_gen->stream) { int speed; speed = this_gen->stream->xine->config->lookup_entry(this_gen->stream->xine->config, - "input.drive_slowdown")->num_value; + "media.audio_cd.drive_slowdown")->num_value; if (speed && ioctl(fd, CDROM_SELECT_SPEED, speed) != 0) xprintf(this_gen->stream->xine, XINE_VERBOSITY_DEBUG, "input_cdda: setting drive speed to %d failed\n", speed); @@ -2063,7 +2063,7 @@ static int cdda_close(cdda_input_plugin_t *this_gen) { if (this_gen->stream) { int speed; speed = this_gen->stream->xine->config->lookup_entry(this_gen->stream->xine->config, - "input.drive_slowdown")->num_value; + "media.audio_cd.drive_slowdown")->num_value; if (speed && ioctl(this_gen->fd, CDROM_SELECT_SPEED, 0) != 0) xprintf(this_gen->stream->xine, XINE_VERBOSITY_DEBUG, "input_cdda: setting drive speed to normal failed\n"); @@ -2513,19 +2513,19 @@ static input_plugin_t *cdda_class_get_instance (input_class_t *cls_gen, xine_str /* * Lookup config entries. */ - if(xine_config_lookup_entry(this->stream->xine, "input.cdda_use_cddb", + if(xine_config_lookup_entry(this->stream->xine, "media.audio_cd.use_cddb", &enable_entry)) enable_cddb_changed_cb(class, &enable_entry); - if(xine_config_lookup_entry(this->stream->xine, "input.cdda_cddb_server", + if(xine_config_lookup_entry(this->stream->xine, "media.audio_cd.cddb_server", &server_entry)) server_changed_cb(class, &server_entry); - if(xine_config_lookup_entry(this->stream->xine, "input.cdda_cddb_port", + if(xine_config_lookup_entry(this->stream->xine, "media.audio_cd.cddb_port", &port_entry)) port_changed_cb(class, &port_entry); - if(xine_config_lookup_entry(this->stream->xine, "input.cdda_cddb_cachedir", + if(xine_config_lookup_entry(this->stream->xine, "media.audio_cd.cddb_cachedir", &cachedir_entry)) cachedir_changed_cb(class, &cachedir_entry); @@ -2581,7 +2581,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->mrls_allocated_entries = 0; this->ip = NULL; - this->cdda_device = config->register_string(config, "input.cdda_device", + this->cdda_device = config->register_string(config, "media.audio_cd.device", DEFAULT_CDDA_DEVICE, _("device used for CD audio"), _("The path to the device, usually a " @@ -2589,7 +2589,7 @@ static void *init_plugin (xine_t *xine, void *data) { "for playing audio CDs."), 10, cdda_device_cb, (void *) this); - config->register_bool(config, "input.cdda_use_cddb", 1, + config->register_bool(config, "media.audio_cd.use_cddb", 1, _("query CDDB"), _("Enables CDDB queries, which will give you " "convenient title and track names for your audio CDs.\n" "Keep in mind that, unless you use your own private CDDB, this information " @@ -2597,7 +2597,7 @@ static void *init_plugin (xine_t *xine, void *data) { "of your listening habits."), 10, enable_cddb_changed_cb, (void *) this); - config->register_string(config, "input.cdda_cddb_server", CDDB_SERVER, + config->register_string(config, "media.audio_cd.cddb_server", CDDB_SERVER, _("CDDB server name"), _("The CDDB server used to retrieve the " "title and track information from.\nThis setting is security critical, " "because the sever will receive information about your listening habits " @@ -2605,12 +2605,12 @@ static void *init_plugin (xine_t *xine, void *data) { "a server you can trust."), XINE_CONFIG_SECURITY, server_changed_cb, (void *) this); - config->register_num(config, "input.cdda_cddb_port", CDDB_PORT, + config->register_num(config, "media.audio_cd.cddb_port", CDDB_PORT, _("CDDB server port"), _("The server port used to retrieve the " "title and track information from."), XINE_CONFIG_SECURITY, port_changed_cb, (void *) this); - config->register_string(config, "input.cdda_cddb_cachedir", + config->register_string(config, "media.audio_cd.cddb_cachedir", (_cdda_cddb_get_default_location()), _("CDDB cache directory"), _("The replies from the CDDB server will be " "cached in this directory.\nThis setting is security critical, because files " @@ -2619,7 +2619,7 @@ static void *init_plugin (xine_t *xine, void *data) { cachedir_changed_cb, (void *) this); #ifdef CDROM_SELECT_SPEED - config->register_num(config, "input.drive_slowdown", 4, + config->register_num(config, "media.audio_cd.drive_slowdown", 4, _("slow down disc drive to this speed factor"), _("Since some CD or DVD drives make some really " "loud noises because of the fast disc rotation, " diff --git a/src/input/input_dvb.c b/src/input/input_dvb.c index 46ecd089a..c1d59729a 100644 --- a/src/input/input_dvb.c +++ b/src/input/input_dvb.c @@ -1186,7 +1186,7 @@ static void do_eit(dvb_input_plugin_t *this) /* Let's get the EPG data only in the wanted language. */ - xine_config_lookup_entry(this->stream->xine, "input.dvd_language", &language); + xine_config_lookup_entry(this->stream->xine, "media.dvd.language", &language); if (language.str_value && *language.str_value && strncmp(language.str_value, &eit[1], 2)) { @@ -1588,7 +1588,7 @@ static void do_record (dvb_input_plugin_t *this) { free(t); strftime(dates,63,"%F_%H%M",tma); - if (xine_config_lookup_entry(this->stream->xine, "misc.save_dir", &savedir)){ + if (xine_config_lookup_entry(this->stream->xine, "media.capture.save_dir", &savedir)){ if(strlen(savedir.str_value)>1){ if(opendir(savedir.str_value)==NULL){ snprintf (filename, 256, "%s/%s_%s.ts",xine_get_homedir(),this->channels[this->channel].name, dates); @@ -2283,7 +2283,7 @@ static int dvb_plugin_open(input_plugin_t * this_gen) this->stream->osd_renderer->filled_rect(this->background, 1, 1, 1000, 600, 4); this->displaying=0; /* zoom for 4:3 in a 16:9 window */ - config->register_bool(config, "input.dvbzoom", + config->register_bool(config, "media.dvb.zoom", 0, _("use DVB 'center cutout' (zoom)"), _("This will allow fullscreen " @@ -2291,13 +2291,13 @@ static int dvb_plugin_open(input_plugin_t * this_gen) "transmitted in a 16:9 frame."), 0, &dvb_zoom_cb, (void *) this); - if (xine_config_lookup_entry(this->stream->xine, "input.dvbzoom", &zoomdvb)) + if (xine_config_lookup_entry(this->stream->xine, "media.dvb.zoom", &zoomdvb)) dvb_zoom_cb((input_plugin_t *) this, &zoomdvb); - if (xine_config_lookup_entry(this->stream->xine, "input.dvb_last_channel_enable", &lastchannel)) + if (xine_config_lookup_entry(this->stream->xine, "media.dvb.remember_channel", &lastchannel)) if (lastchannel.num_value){ /* Remember last watched channel. never show this entry*/ - config->update_num(config, "input.dvb_last_channel_watched", this->channel+1); + config->update_num(config, "media.dvb.last_channel", this->channel+1); } /* @@ -2426,10 +2426,10 @@ static char **dvb_class_get_autoplay_list(input_class_t * this_gen, } fclose (f); - if (xine_config_lookup_entry(class->xine, "input.dvb_last_channel_enable", &lastchannel_enable)) + if (xine_config_lookup_entry(class->xine, "media.dvb.remember_channel", &lastchannel_enable)) if (lastchannel_enable.num_value){ num_channels++; - if (xine_config_lookup_entry(class->xine, "input.dvb_last_channel_watched", &lastchannel)) + if (xine_config_lookup_entry(class->xine, "media.dvb.last_channel", &lastchannel)) default_channel = lastchannel.num_value; } @@ -2504,7 +2504,7 @@ static void *init_class (xine_t *xine, void *data) { xprintf(this->xine,XINE_VERBOSITY_DEBUG,"init class succeeded\n"); /* Enable remembering of last watched channel */ - config->register_bool(config, "input.dvb_last_channel_enable", + config->register_bool(config, "media.dvb.remember_channel", 1, _("Remember last DVB channel watched"), _("On autoplay, xine will remember and " @@ -2512,7 +2512,7 @@ static void *init_class (xine_t *xine, void *data) { 0, NULL, NULL); /* Enable remembering of last watched channel never show this entry*/ - config->register_num(config, "input.dvb_last_channel_watched", + config->register_num(config, "media.dvb.last_channel", -1, _("Remember last DVB channel watched"), _("If enabled, xine will remember and " diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c index 6dc24c241..f69890bae 100644 --- a/src/input/input_dvd.c +++ b/src/input/input_dvd.c @@ -18,7 +18,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: input_dvd.c,v 1.194 2004/12/12 13:51:29 valtri Exp $ + * $Id: input_dvd.c,v 1.195 2004/12/12 22:01:05 mroi Exp $ * */ @@ -951,7 +951,7 @@ static void dvd_handle_events(dvd_input_plugin_t *this) { break; case XINE_EVENT_INPUT_NEXT: { - cfg_entry_t* entry = config->lookup_entry(config, "input.dvd_skip_behaviour"); + cfg_entry_t* entry = config->lookup_entry(config, "media.dvd.skip_behaviour"); int title = 0, part = 0; switch (entry->num_value) { case 0: /* skip by program */ @@ -970,7 +970,7 @@ static void dvd_handle_events(dvd_input_plugin_t *this) { break; case XINE_EVENT_INPUT_PREVIOUS: { - cfg_entry_t *entry = config->lookup_entry(config, "input.dvd_skip_behaviour"); + cfg_entry_t *entry = config->lookup_entry(config, "media.dvd.skip_behaviour"); int title = 0, part = 0; switch (entry->num_value) { case 0: /* skip by program */ @@ -1342,7 +1342,7 @@ static int dvd_parse_try_open(dvd_input_plugin_t *this, const char *locator) dvd_input_class_t *class = (dvd_input_class_t*)this->input_plugin.input_class; xine_cfg_entry_t raw_device; if (xine_config_lookup_entry(this->stream->xine, - "input.dvd_raw_device", &raw_device)) + "media.dvd.raw_device", &raw_device)) xine_setenv("DVDCSS_RAW_DEVICE", raw_device.str_value, 1); intended_dvd_device = class->dvd_device; } @@ -1441,22 +1441,22 @@ static int dvd_plugin_open (input_plugin_t *this_gen) { dvdnav_get_title_string(this->dvdnav, &this->dvd_name); /* Set region code */ - if (xine_config_lookup_entry (this->stream->xine, "input.dvd_region", + if (xine_config_lookup_entry (this->stream->xine, "media.dvd.region", ®ion_entry)) region_changed_cb (class, ®ion_entry); /* Set languages */ - if (xine_config_lookup_entry (this->stream->xine, "input.dvd_language", + if (xine_config_lookup_entry (this->stream->xine, "media.dvd.language", &lang_entry)) language_changed_cb (class, &lang_entry); /* Set cache usage */ - if (xine_config_lookup_entry(this->stream->xine, "input.dvd_use_readahead", + if (xine_config_lookup_entry(this->stream->xine, "media.dvd.readahead", &cache_entry)) read_ahead_cb(class, &cache_entry); /* Set seek mode */ - if (xine_config_lookup_entry(this->stream->xine, "input.dvd_seek_behaviour", + if (xine_config_lookup_entry(this->stream->xine, "media.dvd.seek_behaviour", &cache_entry)) seek_mode_cb(class, &cache_entry); @@ -1692,7 +1692,7 @@ static void *init_class (xine_t *xine, void *data) { this->ip = NULL; this->dvd_device = config->register_string(config, - "input.dvd_device", + "media.dvd.device", DVD_PATH, _("device used for DVD playback"), _("The path to the device, usually a " @@ -1706,7 +1706,7 @@ static void *init_class (xine_t *xine, void *data) { char *css_cache_default, *css_cache; int mode; - raw_device = config->register_string(config, "input.dvd_raw_device", + raw_device = config->register_string(config, "media.dvd.raw_device", RDVD_PATH, _("raw device set up for DVD access"), _("If this points to a raw device connected to your " "DVD device, xine will use the raw device for playback. " @@ -1720,7 +1720,7 @@ static void *init_class (xine_t *xine, void *data) { 10, NULL, NULL); if (raw_device) xine_setenv("DVDCSS_RAW_DEVICE", raw_device, 0); - mode = config->register_enum(config, "input.css_decryption_method", 0, + mode = config->register_enum(config, "media.dvd.css_decryption_method", 0, decrypt_modes, _("CSS decryption method"), _("Selects the decryption method libdvdcss will use to descramble " "copy protected DVDs. Try the various methods, if you have problems " @@ -1729,7 +1729,7 @@ static void *init_class (xine_t *xine, void *data) { css_cache_default = (char *)malloc(strlen(xine_get_homedir()) + 10); sprintf(css_cache_default, "%s/.dvdcss/", xine_get_homedir()); - css_cache = config->register_string(config, "input.css_cache_path", css_cache_default, + css_cache = config->register_string(config, "media.dvd.css_cache_path", css_cache_default, _("path to the title key cache"), _("Since cracking the copy protection of scrambled DVDs can " "be quite time consuming, libdvdcss will cache the cracked " @@ -1751,28 +1751,28 @@ static void *init_class (xine_t *xine, void *data) { dlclose(dvdcss); } - config->register_num(config, "input.dvd_region", + config->register_num(config, "media.dvd.region", 1, _("region the DVD player claims to be in (1 to 8)"), _("This only needs to be changed if your DVD jumps to a screen " "complaining about a wrong region code. It has nothing to do with " "the region code set in DVD drives, this is purely software."), 0, region_changed_cb, this); - config->register_string(config, "input.dvd_language", + config->register_string(config, "media.dvd.language", "en", _("default language for DVD playback"), _("xine tries to use this language as a default for DVD playback. " "As far as the DVD supports it, menus and audio tracks will be presented " "in this language.\nThe value must be a two character ISO639 language code."), 0, language_changed_cb, this); - config->register_bool(config, "input.dvd_use_readahead", + config->register_bool(config, "media.dvd.readahead", 1, _("read-ahead caching"), _("xine can use a read ahead cache for DVD drive access.\n" "This may lead to jerky playback on slow drives, but it improves the impact " "of the DVD layer change on faster drives."), 10, read_ahead_cb, this); - config->register_enum(config, "input.dvd_skip_behaviour", 0, + config->register_enum(config, "media.dvd.skip_behaviour", 0, skip_modes, _("unit for the skip action"), _("You can configure the behaviour when issuing a skip command (using the skip " @@ -1788,7 +1788,7 @@ static void *init_class (xine_t *xine, void *data) { "will skip a DVD title, which is a structural unit representing entire " "features on the DVD"), 20, NULL, NULL); - config->register_enum(config, "input.dvd_seek_behaviour", 0, + config->register_enum(config, "media.dvd.seek_behaviour", 0, seek_modes, _("unit for seeking"), _("You can configure the domain spanned by the seek slider. The individual " diff --git a/src/input/input_file.c b/src/input/input_file.c index 9e761f3cd..9c7cf24fc 100644 --- a/src/input/input_file.c +++ b/src/input/input_file.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: input_file.c,v 1.96 2004/09/02 19:56:42 valtri Exp $ + * $Id: input_file.c,v 1.97 2004/12/12 22:01:06 mroi Exp $ */ #ifdef HAVE_CONFIG_H @@ -553,7 +553,7 @@ static xine_mrl_t **file_class_get_dir (input_class_t *this_gen, /* Store new origin path */ __try_again_from_home: - this->config->update_string(this->config, "input.file_origin_path", current_dir); + this->config->update_string(this->config, "media.files.origin_path", current_dir); if(strcasecmp(current_dir, "/")) snprintf(current_dir_slashed, sizeof(current_dir_slashed), "%s/", current_dir); @@ -867,7 +867,7 @@ static void *init_plugin (xine_t *xine, void *data) { if(getcwd(current_dir, sizeof(current_dir)) == NULL) strcpy(current_dir, "."); - this->origin_path = config->register_string(config, "input.file_origin_path", + this->origin_path = config->register_string(config, "media.files.origin_path", current_dir, _("file browsing start location"), _("The browser to select the file to play will " @@ -876,7 +876,7 @@ static void *init_plugin (xine_t *xine, void *data) { } this->show_hidden_files = config->register_bool(config, - "input.file_hidden_files", + "media.files.show_hidden_files", 0, _("list hidden files"), _("If enabled, the browser to select the file to " "play will also show hidden files."), diff --git a/src/input/input_http.c b/src/input/input_http.c index a44c662f2..fbd5d9d87 100644 --- a/src/input/input_http.c +++ b/src/input/input_http.c @@ -19,7 +19,7 @@ * * input plugin for http network streams * - * $Id: input_http.c,v 1.100 2004/12/01 22:55:31 tmattern Exp $ + * $Id: input_http.c,v 1.101 2004/12/12 22:01:06 mroi Exp $ */ #ifdef HAVE_CONFIG_H @@ -1045,26 +1045,26 @@ static void *init_class (xine_t *xine, void *data) { * proxy settings */ this->proxyhost = config->register_string(config, - "input.http_proxy_host", proxy_env ? this->proxyhost_env : "", + "media.network.http_proxy_host", proxy_env ? this->proxyhost_env : "", _("HTTP proxy host"), _("The hostname of the HTTP proxy."), 10, proxy_host_change_cb, (void *) this); this->proxyport = config->register_num(config, - "input.http_proxy_port", proxy_env ? this->proxyport_env : DEFAULT_HTTP_PORT, + "media.network.http_proxy_port", proxy_env ? this->proxyport_env : DEFAULT_HTTP_PORT, _("HTTP proxy port"), _("The port number of the HTTP proxy."), 10, proxy_port_change_cb, (void *) this); /* registered entries could be empty. Don't ignore envvar */ if(!strlen(this->proxyhost) && (proxy_env && strlen(proxy_env))) { - config->update_string(config, "input.http_proxy_host", this->proxyhost_env); - config->update_num(config, "input.http_proxy_port", this->proxyport_env); + config->update_string(config, "media.network.http_proxy_host", this->proxyhost_env); + config->update_num(config, "media.network.http_proxy_port", this->proxyport_env); } this->proxyuser = config->register_string(config, - "input.http_proxy_user", "", _("HTTP proxy username"), + "media.network.http_proxy_user", "", _("HTTP proxy username"), _("The user name for the HTTP proxy."), 10, proxy_user_change_cb, (void *) this); this->proxypassword = config->register_string(config, - "input.http_proxy_password", "", _("HTTP proxy password"), + "media.network.http_proxy_password", "", _("HTTP proxy password"), _("The password for the HTTP proxy."), 10, proxy_password_change_cb, (void *) this); this->noproxylist = config->register_string(config, diff --git a/src/input/input_mms.c b/src/input/input_mms.c index b4c7289e7..7ed6cf152 100644 --- a/src/input/input_mms.c +++ b/src/input/input_mms.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: input_mms.c,v 1.53 2004/07/20 00:50:11 rockyb Exp $ + * $Id: input_mms.c,v 1.54 2004/12/12 22:01:06 mroi Exp $ * * mms input plugin based on work from major mms */ @@ -394,7 +394,7 @@ static input_plugin_t *mms_class_get_instance (input_class_t *cls_gen, xine_stre this->mrl = mrl; this->nbc = nbc_init (this->stream); - if (xine_config_lookup_entry (stream->xine, "input.mms_network_bandwidth", + if (xine_config_lookup_entry (stream->xine, "media.network.bandwidth", &bandwidth_entry)) { bandwidth_changed_cb(cls, &bandwidth_entry); } @@ -451,7 +451,7 @@ static void *init_class (xine_t *xine, void *data) { this->input_class.dispose = mms_class_dispose; this->input_class.eject_media = NULL; - xine->config->register_enum(xine->config, "input.mms_network_bandwidth", 10, + xine->config->register_enum(xine->config, "media.network.bandwidth", 10, (char **)mms_bandwidth_strs, _("network bandwidth"), _("Specify the bandwidth of your internet connection here. " @@ -460,7 +460,7 @@ static void *init_class (xine_t *xine, void *data) { 0, bandwidth_changed_cb, (void*) this); this->protocol = xine->config->register_enum(xine->config, - "input.mms_protocol", + "media.network.mms_protocol", 0, (char **)mms_protocol_strs, _("MMS protocol"), diff --git a/src/input/input_pvr.c b/src/input/input_pvr.c index 2fe965378..f6c8157e9 100644 --- a/src/input/input_pvr.c +++ b/src/input/input_pvr.c @@ -29,7 +29,7 @@ * - may erase files as they get old * * requires: - * - audio.av_sync_method=resample + * - audio.synchronization.av_sync_method=resample * - ivtv driver (01 Jul 2003 cvs is known to work) * * MRL: @@ -38,7 +38,7 @@ * usage: * xine pvr:/<prefix_to_tmp_files>\!<prefix_to_saved_files>\!<max_page_age> * - * $Id: input_pvr.c,v 1.51 2004/10/29 23:11:37 miguelfreitas Exp $ + * $Id: input_pvr.c,v 1.52 2004/12/12 22:01:06 mroi Exp $ */ /************************************************************************** @@ -256,7 +256,7 @@ typedef struct { * speed in order to regulate fifo usage, that is, * trying to match the rate of generated data. * - * OBS: use with audio.av_sync_method=resample + * OBS: use with audio.synchronization.av_sync_method=resample * *************************************************** */ @@ -444,7 +444,7 @@ static off_t pvr_plugin_read (input_plugin_t *this_gen, char *buf, off_t len) { * - underrun: buffer gets empty. playback will suffer a pausing effect, also discarding * video frames. * - * OBS: use with audio.av_sync_method=resample + * OBS: use with audio.synchronization.av_sync_method=resample */ static void pvr_adjust_realtime_speed(pvr_input_plugin_t *this, fifo_buffer_t *fifo, int speed ) { @@ -1428,7 +1428,7 @@ static int pvr_plugin_open (input_plugin_t *this_gen ) { this->event_queue = xine_event_new_queue (this->stream); /* enable resample method */ - this->stream->xine->config->update_num(this->stream->xine->config,"audio.av_sync_method",1); + this->stream->xine->config->update_num(this->stream->xine->config,"audio.synchronization.av_sync_method",1); this->pvr_running = 1; @@ -1546,7 +1546,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->config = xine->config; this->devname = this->config->register_string(this->config, - "input.pvr_device", + "media.wintv_pvr.device", PVR_DEVICE, _("device used for WinTV-PVR 250/350 (pvr plugin)"), _("The path to the device of your WinTV card."), diff --git a/src/input/input_v4l.c b/src/input/input_v4l.c index 0e62343b2..fcf144602 100644 --- a/src/input/input_v4l.c +++ b/src/input/input_v4l.c @@ -209,7 +209,7 @@ typedef struct { * speed in order to regulate fifo usage, that is, * trying to match the rate of generated data. * - * OBS: use with audio.av_sync_method=resample + * OBS: use with audio.synchronization.av_sync_method=resample * *************************************************** */ @@ -757,7 +757,7 @@ static int open_radio_capture_device(v4l_input_plugin_t *this) lprintf("open_radio_capture_device\n"); entry = this->stream->xine->config->lookup_entry(this->stream->xine->config, - "input.v4l_radio_device_path"); + "media.video4linux.radio_device"); if((this->radio_fd = open(entry->str_value, O_RDWR)) < 0) { xprintf(this->stream->xine, XINE_VERBOSITY_LOG, @@ -808,7 +808,7 @@ static int open_video_capture_device(v4l_input_plugin_t *this) lprintf("open_video_capture_device\n"); entry = this->stream->xine->config->lookup_entry(this->stream->xine->config, - "input.v4l_video_device_path"); + "media.video4linux.video_device"); /* Try to open the video device */ if((this->video_fd = open(entry->str_value, O_RDWR)) < 0) { @@ -1683,7 +1683,7 @@ static int v4l_plugin_video_open (input_plugin_t *this_gen) this->scr_tunning = 0; /* enable resample method */ - this->stream->xine->config->update_num(this->stream->xine->config, "audio.av_sync_method", 1); + this->stream->xine->config->update_num(this->stream->xine->config, "audio.synchronization.av_sync_method", 1); this->event_queue = xine_event_new_queue (this->stream); @@ -1771,7 +1771,7 @@ static input_plugin_t *v4l_class_get_video_instance (input_class_t *cls_gen, return NULL; entry = this->stream->xine->config->lookup_entry(this->stream->xine->config, - "input.v4l_video_device_path"); + "media.video4linux.video_device"); /* Try to open the video device */ if((this->video_fd = open(entry->str_value, O_RDWR)) < 0) { @@ -1835,7 +1835,7 @@ static input_plugin_t *v4l_class_get_radio_instance (input_class_t *cls_gen, return NULL; entry = this->stream->xine->config->lookup_entry(this->stream->xine->config, - "input.v4l_radio_device_path"); + "media.video4linux.radio_device"); if((this->radio_fd = open(entry->str_value, O_RDWR)) < 0) { xprintf(this->stream->xine, XINE_VERBOSITY_LOG, @@ -1905,7 +1905,7 @@ static void *init_video_class (xine_t *xine, void *data) this->input_class.dispose = v4l_class_dispose; this->input_class.eject_media = NULL; - config->register_string (config, "input.v4l_video_device_path", + config->register_string (config, "media.video4linux.video_device", VIDEO_DEV, _("v4l video device"), _("The path to your Video4Linux video device."), @@ -1931,7 +1931,7 @@ static void *init_radio_class (xine_t *xine, void *data) this->input_class.dispose = v4l_class_dispose; this->input_class.eject_media = NULL; - config->register_string (config, "input.v4l_radio_device_path", + config->register_string (config, "media.video4linux.radio_device", RADIO_DEV, _("v4l radio device"), _("The path to your Video4Linux radio device."), diff --git a/src/input/input_vcd.c b/src/input/input_vcd.c index eed5e2796..3ea2ed4d0 100644 --- a/src/input/input_vcd.c +++ b/src/input/input_vcd.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: input_vcd.c,v 1.76 2004/10/20 05:04:00 athp Exp $ + * $Id: input_vcd.c,v 1.77 2004/12/12 22:01:07 mroi Exp $ * */ @@ -1090,7 +1090,7 @@ static void *init_class (xine_t *xine, void *data) { this->input_class.dispose = vcd_class_dispose; this->input_class.eject_media = vcd_class_eject_media; - this->device = config->register_string (config, "input.vcd_device", CDROM, + this->device = config->register_string (config, "media.vcd.device", CDROM, _("device used for VCD playback"), _("The path to the device, usually a CD or DVD drive, " "you intend to play your VideoCDs with."), diff --git a/src/input/net_buf_ctrl.c b/src/input/net_buf_ctrl.c index 5869bb21d..f5ad8148d 100644 --- a/src/input/net_buf_ctrl.c +++ b/src/input/net_buf_ctrl.c @@ -507,13 +507,13 @@ nbc_t *nbc_init (xine_stream_t *stream) { /* when the FIFO sizes are increased compared to the default configuration, * apply a factor to the high water mark */ - entry = stream->xine->config->lookup_entry(stream->xine->config, "video.num_buffers"); + entry = stream->xine->config->lookup_entry(stream->xine->config, "engine.buffers.video_num_buffers"); /* No entry when no video output */ if (entry) video_fifo_factor = (double)video_fifo->buffer_pool_capacity / (double)entry->num_default; else video_fifo_factor = 1.0; - entry = stream->xine->config->lookup_entry(stream->xine->config, "audio.num_buffers"); + entry = stream->xine->config->lookup_entry(stream->xine->config, "engine.buffers.audio_num_buffers"); /* When there's no audio output, there's no entry */ if (entry) audio_fifo_factor = (double)audio_fifo->buffer_pool_capacity / (double)entry->num_default; diff --git a/src/input/vcd/xineplug_inp_vcd.c b/src/input/vcd/xineplug_inp_vcd.c index 926a303c2..d8c95aae1 100644 --- a/src/input/vcd/xineplug_inp_vcd.c +++ b/src/input/vcd/xineplug_inp_vcd.c @@ -1,5 +1,5 @@ /* - $Id: xineplug_inp_vcd.c,v 1.25 2004/07/25 17:42:55 mroi Exp $ + $Id: xineplug_inp_vcd.c,v 1.26 2004/12/12 22:01:07 mroi Exp $ Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com> @@ -1655,7 +1655,7 @@ vcd_init (xine_t *xine, void *data) my_vcd.player.default_autoplay = config->register_enum(config, - "vcd.autoplay", + "media.vcd.autoplay", VCDPLAYER_AUTOPLAY_PBC, (char **) autoplay_modes, _("default type to use on VCD autoplay"), @@ -1667,7 +1667,7 @@ _("The play unit to use when none is specified in an MRL, e.g. " class->vcd_device = strdup (config->register_string(config, - "vcd.default_device", + "media.vcd.device", "", _("default CD drive used for VCD when none given"), _("What to use if no drive specified. If the setting is empty, xine will scan for CD drives."), @@ -1677,7 +1677,7 @@ _("What to use if no drive specified. If the setting is empty, xine will scan fo my_vcd.player.slider_length = config->register_enum(config, - "vcd.length_reporting", + "media.vcd.length_reporting", VCDPLAYER_SLIDER_LENGTH_AUTO, (char **) length_reporting_modes, _("position slider range"), @@ -1698,7 +1698,7 @@ _("The range the stream playback position slider represents when playing."), my_vcd.player.autoadvance = config->register_bool(config, - "vcd.autoadvance", + "media.vcd.autoadvance", (int) true, _("automatically advance track/entry"), _("If enabled, we should automatically advance to the next entry or track. Used only when playback control (PBC) is disabled."), @@ -1708,7 +1708,7 @@ _("If enabled, we should automatically advance to the next entry or track. Used my_vcd.player.show_rejected = config->register_bool(config, - "vcd.show_rejected", + "media.vcd.show_rejected", (int) false, _("show 'rejected' LIDs"), _("Some playback list IDs (LIDs) are marked not showable, " @@ -1720,7 +1720,7 @@ _("Some playback list IDs (LIDs) are marked not showable, " my_vcd.v_config.title_format = strdup(config->register_string(config, - "vcd.title_format", + "media.vcd.title_format", "%F - %I %N%L%S, disk %c of %C - %v %A", _("format string for display banner"), _("Format used in the GUI Title. Similar to the Unix date " @@ -1732,7 +1732,7 @@ _("Format used in the GUI Title. Similar to the Unix date " my_vcd.v_config.comment_format = strdup(config->register_string(config, - "vcd.comment_format", + "media.vcd.comment_format", "%P - Track %T", _("format string for stream comment field"), _("Format used in the GUI Title. Similar to the Unix date " @@ -1744,7 +1744,7 @@ _("Format used in the GUI Title. Similar to the Unix date " vcdplayer_debug = config->register_num(config, - "vcd.debug", + "media.vcd.debug", 0, _("debug flag mask"), _("This integer is a debugging mask when interpreted in binary."), diff --git a/src/liba52/xine_decoder.c b/src/liba52/xine_decoder.c index a8ec8edd0..53ad05f83 100644 --- a/src/liba52/xine_decoder.c +++ b/src/liba52/xine_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: xine_decoder.c,v 1.71 2004/11/03 19:30:04 mroi Exp $ + * $Id: xine_decoder.c,v 1.72 2004/12/12 22:01:08 mroi Exp $ * * stuff needed to turn liba52 into a xine decoder plugin */ @@ -775,7 +775,7 @@ static void *init_plugin (xine_t *xine, void *data) { cfg = this->config = xine->config; - this->a52_level = (float) cfg->register_range (cfg, "codec.a52_level", 100, + this->a52_level = (float) cfg->register_range (cfg, "audio.a52.level", 100, 0, 200, _("A/52 volume"), _("With A/52 audio, you can modify the volume " @@ -785,7 +785,7 @@ static void *init_plugin (xine_t *xine, void *data) { "channel downmixing will work on an audio stream " "of the given volume."), 10, a52_level_change_cb, this) / 100.0; - this->disable_dynrng_compress = !cfg->register_bool (cfg, "codec.a52_dynrng", 0, + this->disable_dynrng_compress = !cfg->register_bool (cfg, "audio.a52.dynamic_range", 0, _("use A/52 dynamic range compression"), _("Dynamic range compression limits the dynamic " "range of the audio. This means making the loud " @@ -793,7 +793,7 @@ static void *init_plugin (xine_t *xine, void *data) { "more easily listen to the audio in a noisy " "environment without disturbing anyone."), 0, dynrng_compress_change_cb, this); - this->enable_surround_downmix = cfg->register_bool (cfg, "codec.a52_surround_downmix", 0, + this->enable_surround_downmix = cfg->register_bool (cfg, "audio.a52.surround_downmix", 0, _("downmix audio to 2 channel surround stereo"), _("When you want to listen to multichannel surround " "sound, but you have only two speakers or a " diff --git a/src/libffmpeg/video_decoder.c b/src/libffmpeg/video_decoder.c index 3d29b5233..fd3715023 100644 --- a/src/libffmpeg/video_decoder.c +++ b/src/libffmpeg/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.36 2004/12/08 21:41:46 miguelfreitas Exp $ + * $Id: video_decoder.c,v 1.37 2004/12/12 22:01:08 mroi Exp $ * * xine video decoder plugin using ffmpeg * @@ -1269,7 +1269,7 @@ void *init_video_plugin (xine_t *xine, void *data) { * moment */ config = xine->config; - this->pp_quality = xine->config->register_range(config, "codec.ffmpeg_pp_quality", 3, + this->pp_quality = xine->config->register_range(config, "video.processing.ffmpeg_pp_quality", 3, 0, PP_QUALITY_MAX, _("MPEG-4 postprocessing quality"), _("You can adjust the amount of post processing applied to MPEG-4 video.\n" diff --git a/src/libffmpeg/xine_encoder.c b/src/libffmpeg/xine_encoder.c index 7cae08590..55f5e22ac 100644 --- a/src/libffmpeg/xine_encoder.c +++ b/src/libffmpeg/xine_encoder.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_encoder.c,v 1.19 2004/09/12 19:23:37 mroi Exp $ + * $Id: xine_encoder.c,v 1.20 2004/12/12 22:01:09 mroi Exp $ */ /* mpeg encoders for the dxr3 video out plugin. */ @@ -160,7 +160,7 @@ static int lavc_on_update_format(dxr3_driver_t *drv, dxr3_frame_t *frame) /* put sample parameters */ this->context->bit_rate = drv->class->xine->config->register_range(drv->class->xine->config, - "dxr3.lavc_bitrate", 10000, 1000, 20000, + "dxr3.encoding.lavc_bitrate", 10000, 1000, 20000, _("libavcodec mpeg output bitrate (kbit/s)"), _("The bitrate the libavcodec mpeg encoder should use for DXR3's encoding mode. " "Higher values will increase quality and CPU usage.\n" @@ -168,7 +168,7 @@ static int lavc_on_update_format(dxr3_driver_t *drv, dxr3_frame_t *frame) this->context->bit_rate *= 1000; /* config in kbit/s, libavcodec wants bit/s */ use_quantizer = drv->class->xine->config->register_bool(drv->class->xine->config, - "dxr3.lavc_quantizer", 1, + "dxr3.encoding.lavc_quantizer", 1, _("constant quality mode"), _("When enabled, libavcodec will use a constant quality mode by dynamically " "compressing the images based on their complexity. When disabled, libavcodec " @@ -176,13 +176,13 @@ static int lavc_on_update_format(dxr3_driver_t *drv, dxr3_frame_t *frame) if (use_quantizer) { this->context->qmin = drv->class->xine->config->register_range(drv->class->xine->config, - "dxr3.lavc_qmin", 1, 1, 10, + "dxr3.encoding.lavc_qmin", 1, 1, 10, _("minimum compression"), _("The minimum compression to apply to an image in constant quality mode."), 10, NULL, NULL); this->context->qmax = drv->class->xine->config->register_range(drv->class->xine->config, - "dxr3.lavc_qmax", 2, 1, 20, + "dxr3.encoding.lavc_qmax", 2, 1, 20, _("maximum quantizer"), _("The maximum compression to apply to an image in constant quality mode."), 10, NULL, NULL); diff --git a/src/libflac/Makefile.am b/src/libflac/Makefile.am index c56e4f327..18e9798f1 100644 --- a/src/libflac/Makefile.am +++ b/src/libflac/Makefile.am @@ -14,4 +14,4 @@ xineplug_flac_la_SOURCES = demux_flac.c decoder_flac.c xineplug_flac_la_LIBADD = $(LIBFLAC_LIBS) xineplug_flac_la_LDFLAGS = -avoid-version -module -lFLAC @XINE_PLUGIN_MIN_SYMS@ -noinst_HEADERS = demux_flac.h
\ No newline at end of file +noinst_HEADERS = demux_flac.h diff --git a/src/libreal/audio_decoder.c b/src/libreal/audio_decoder.c index f22eea71e..8276f8bcd 100644 --- a/src/libreal/audio_decoder.c +++ b/src/libreal/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.41 2004/12/08 17:10:29 miguelfreitas Exp $ + * $Id: audio_decoder.c,v 1.42 2004/12/12 22:01:09 mroi Exp $ * * thin layer to use real binary-only codecs in xine * @@ -167,7 +167,7 @@ static inline int is_x86_64_object(const char *filename) static int load_syms_linux (realdec_decoder_t *this, char *codec_name) { cfg_entry_t* entry = this->stream->xine->config->lookup_entry( - this->stream->xine->config, "codec.real_codecs_path"); + this->stream->xine->config, "decoder.external.real_codecs_path"); char path[1024]; snprintf (path, sizeof(path), "%s/%s", entry->str_value, codec_name); @@ -726,7 +726,7 @@ static void *init_class (xine_t *xine, void *data) { if (!stat ("/usr/lib/win32/drv3.so.6.0", &s)) default_real_codec_path = "/usr/lib/win32"; - real_codec_path = config->register_string (config, "codec.real_codecs_path", + real_codec_path = config->register_string (config, "decoder.external.real_codecs_path", default_real_codec_path, _("path to RealPlayer codecs"), _("If you have RealPlayer installed, specify the path " diff --git a/src/libreal/xine_decoder.c b/src/libreal/xine_decoder.c index b246b728a..1cbf9f833 100644 --- a/src/libreal/xine_decoder.c +++ b/src/libreal/xine_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: xine_decoder.c,v 1.74 2004/12/08 17:10:29 miguelfreitas Exp $ + * $Id: xine_decoder.c,v 1.75 2004/12/12 22:01:10 mroi Exp $ * * thin layer to use real binary-only codecs in xine * @@ -156,7 +156,7 @@ static inline int is_x86_64_object(const char *filename) static int load_syms_linux (realdec_decoder_t *this, char *codec_name) { cfg_entry_t* entry = this->stream->xine->config->lookup_entry( - this->stream->xine->config, "codec.real_codecs_path"); + this->stream->xine->config, "decoder.external.real_codecs_path"); char path[1024]; snprintf (path, sizeof(path), "%s/%s", entry->str_value, codec_name); @@ -606,7 +606,7 @@ static void *init_class (xine_t *xine, void *data) { if (!stat ("/usr/lib/win32/drv3.so.6.0", &s)) default_real_codec_path = "/usr/lib/win32"; - real_codec_path = config->register_string (config, "codec.real_codecs_path", + real_codec_path = config->register_string (config, "decoder.external.real_codecs_path", default_real_codec_path, _("path to RealPlayer codecs"), _("If you have RealPlayer installed, specify the path " diff --git a/src/libspucc/xine_decoder.c b/src/libspucc/xine_decoder.c index 8e3f88dea..ae23ed43d 100644 --- a/src/libspucc/xine_decoder.c +++ b/src/libspucc/xine_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: xine_decoder.c,v 1.30 2004/05/05 17:36:48 mroi Exp $ + * $Id: xine_decoder.c,v 1.31 2004/12/12 22:01:10 mroi Exp $ * * closed caption spu decoder. receive data by events. * @@ -151,7 +151,7 @@ static void spucc_font_change(void *this_gen, xine_cfg_entry_t *value) cc_config_t *cc_cfg = &this->cc_cfg; char *font; - if (strcmp(value->key, "misc.cc_font") == 0) + if (strcmp(value->key, "subtitles.closedcaption.font") == 0) font = cc_cfg->font; else font = cc_cfg->italic_font; @@ -170,7 +170,7 @@ static void spucc_num_change(void *this_gen, xine_cfg_entry_t *value) cc_config_t *cc_cfg = &this->cc_cfg; int *num; - if (strcmp(value->key, "misc.cc_font_size") == 0) + if (strcmp(value->key, "subtitles.closedcaption.font_size") == 0) num = &cc_cfg->font_size; else num = &cc_cfg->center; @@ -188,14 +188,14 @@ static void spucc_register_cfg_vars(spucc_class_t *this, cc_config_t *cc_vars = &this->cc_cfg; cc_vars->cc_enabled = xine_cfg->register_bool(xine_cfg, - "misc.cc_enabled", 0, + "subtitles.closedcaption.enabled", 0, _("display closed captions in MPEG-2 streams"), _("Closed Captions are subtitles mostly meant " "to help the hearing impaired."), 0, spucc_cfg_enable_change, this); cc_vars->cc_scheme = xine_cfg->register_enum(xine_cfg, - "misc.cc_scheme", 0, + "subtitles.closedcaption.scheme", 0, cc_schemes, _("closed-captioning foreground/background scheme"), _("Choose your favourite rendering of the closed " @@ -203,26 +203,26 @@ static void spucc_register_cfg_vars(spucc_class_t *this, 10, spucc_cfg_scheme_change, this); copy_str(cc_vars->font, - xine_cfg->register_string(xine_cfg, "misc.cc_font", "cc", + xine_cfg->register_string(xine_cfg, "subtitles.closedcaption.font", "cc", _("standard closed captioning font"), _("Choose the font for standard closed captions text."), 20, spucc_font_change, this), CC_FONT_MAX); copy_str(cc_vars->italic_font, - xine_cfg->register_string(xine_cfg, "misc.cc_italic_font", "cci", + xine_cfg->register_string(xine_cfg, "subtitles.closedcaption.italic_font", "cci", _("italic closed captioning font"), _("Choose the font for italic closed captions text."), 20, spucc_font_change, this), CC_FONT_MAX); - cc_vars->font_size = xine_cfg->register_num(xine_cfg, "misc.cc_font_size", + cc_vars->font_size = xine_cfg->register_num(xine_cfg, "subtitles.closedcaption.font_size", 24, _("closed captioning font size"), _("Choose the font size for closed captions text."), 10, spucc_num_change, this); - cc_vars->center = xine_cfg->register_bool(xine_cfg, "misc.cc_center", 1, + cc_vars->center = xine_cfg->register_bool(xine_cfg, "subtitles.closedcaption.center", 1, _("center-adjust closed captions"), _("When enabled, closed captions will be positioned " "by the center of the individual lines."), diff --git a/src/libspucmml/xine_decoder.c b/src/libspucmml/xine_decoder.c index c64a873db..ddf3714ae 100644 --- a/src/libspucmml/xine_decoder.c +++ b/src/libspucmml/xine_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: xine_decoder.c,v 1.3 2004/09/12 09:29:28 f1rmb Exp $ + * $Id: xine_decoder.c,v 1.4 2004/12/12 22:01:10 mroi Exp $ * */ @@ -473,13 +473,13 @@ static spu_decoder_t *spucmml_class_open_plugin (spu_decoder_class_t *class_gen, this->subtitle_size = 1; this->font = class->xine->config->register_string(class->xine->config, - "misc.spu_font", + "subtitles.separate.font", "sans", _("font for external subtitles"), NULL, 0, update_osd_font, this); this->vertical_offset = class->xine->config->register_num(class->xine->config, - "misc.spu_vertical_offset", + "subtitles.separate.vertical_offset", 0, _("subtitle vertical offset (relative window size)"), NULL, 0, update_vertical_offset, this); @@ -525,7 +525,7 @@ static void *init_spu_decoder_plugin (xine_t *xine, void *data) { this->xine = xine; this->src_encoding = xine->config->register_string(xine->config, - "misc.spu_src_encoding", + "subtitles.separate.src_encoding", "iso-8859-1", _("encoding of subtitles"), NULL, 10, update_src_encoding, this); diff --git a/src/libsputext/demux_sputext.c b/src/libsputext/demux_sputext.c index fe58b9a44..730107d44 100644 --- a/src/libsputext/demux_sputext.c +++ b/src/libsputext/demux_sputext.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: demux_sputext.c,v 1.41 2004/11/03 19:17:54 mroi Exp $ + * $Id: demux_sputext.c,v 1.42 2004/12/12 22:01:10 mroi Exp $ * * code based on old libsputext/xine_decoder.c * @@ -1501,7 +1501,7 @@ static void *init_sputext_demux_class (xine_t *xine, void *data) { * better define timeout of hidding. Setting to zero means "no timeout". */ this->max_timeout = xine->config->register_num(xine->config, - "misc.sub_timeout", 4, + "subtitles.separate.timeout", 4, _("default duration of subtitle display in seconds"), _("Some subtitle formats do not explicitly give a duration for each subtitle. " "For these, you can set a default duration here. Setting to zero will result " diff --git a/src/libsputext/xine_decoder.c b/src/libsputext/xine_decoder.c index bb5ef43c0..4b2a4e055 100644 --- a/src/libsputext/xine_decoder.c +++ b/src/libsputext/xine_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: xine_decoder.c,v 1.86 2004/08/27 21:07:31 miguelfreitas Exp $ + * $Id: xine_decoder.c,v 1.87 2004/12/12 22:01:11 mroi Exp $ * */ @@ -897,7 +897,7 @@ static void *init_spu_decoder_plugin (xine_t *xine, void *data) { this->xine = xine; this->subtitle_size = xine->config->register_enum(xine->config, - "misc.spu_subtitle_size", + "subtitles.separate.subtitle_size", 1, subtitle_size_strings, _("subtitle size"), @@ -905,14 +905,14 @@ static void *init_spu_decoder_plugin (xine_t *xine, void *data) { "be evaluated relative to the window size."), 0, update_subtitle_size, this); this->vertical_offset = xine->config->register_num(xine->config, - "misc.spu_vertical_offset", + "subtitles.separate.vertical_offset", 0, _("subtitle vertical offset"), _("You can adjust the vertical position of the subtitle. " "The setting will be evaluated relative to the window size."), 0, update_vertical_offset, this); strncpy(this->font, xine->config->register_string(xine->config, - "misc.spu_font", + "subtitles.separate.font", "sans", _("font for subtitles"), _("A font from the xine font directory to be used for the " @@ -920,7 +920,7 @@ static void *init_spu_decoder_plugin (xine_t *xine, void *data) { 10, update_osd_font, this), FONTNAME_SIZE); this->font[FONTNAME_SIZE - 1] = '\0'; this->src_encoding = xine->config->register_string(xine->config, - "misc.spu_src_encoding", + "subtitles.separate.src_encoding", xine_guess_spu_encoding(), _("encoding of the subtitles"), _("The encoding of the subtitle text in the stream. This setting " @@ -929,7 +929,7 @@ static void *init_spu_decoder_plugin (xine_t *xine, void *data) { "creator of the subtitles what encoding was used."), 10, update_src_encoding, this); this->use_unscaled = xine->config->register_bool(xine->config, - "misc.spu_use_unscaled_osd", + "subtitles.separate.use_unscaled_osd", 1, _("use unscaled OSD if possible"), _("The unscaled OSD will be rendered independently of the video " diff --git a/src/libw32dll/qt_decoder.c b/src/libw32dll/qt_decoder.c index b61bce0fc..e4df5aba5 100644 --- a/src/libw32dll/qt_decoder.c +++ b/src/libw32dll/qt_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: qt_decoder.c,v 1.37 2004/06/06 16:13:30 jstembridge Exp $ + * $Id: qt_decoder.c,v 1.38 2004/12/12 22:01:25 mroi Exp $ * * quicktime video/audio decoder plugin, using win32 dlls * most of this code comes directly from MPlayer @@ -617,7 +617,7 @@ static void *qta_init_class (xine_t *xine, void *data) { this->decoder_class.dispose = qta_dispose_class; cfg = xine->config; - win32_def_path = cfg->register_string (cfg, "codec.win32_path", WIN32_PATH, + win32_def_path = cfg->register_string (cfg, "decoder.external.win32_codecs_path", WIN32_PATH, _("path to Win32 codecs"), _("If you have the Windows or Apple Quicktime codec packs " "installed, specify the path the codec directory here. " @@ -1137,7 +1137,7 @@ static void *qtv_init_class (xine_t *xine, void *data) { qtv_class_t *this; config_values_t *cfg = xine->config; - win32_def_path = cfg->register_string (cfg, "codec.win32_path", WIN32_PATH, + win32_def_path = cfg->register_string (cfg, "decoder.external.win32_codecs_path", WIN32_PATH, _("path to Win32 codecs"), _("If you have the Windows or Apple Quicktime codec packs " "installed, specify the path the codec directory here. " diff --git a/src/libw32dll/w32codec.c b/src/libw32dll/w32codec.c index 9c5d6bfbb..08340d0e1 100644 --- a/src/libw32dll/w32codec.c +++ b/src/libw32dll/w32codec.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: w32codec.c,v 1.143 2004/06/05 15:59:36 tmattern Exp $ + * $Id: w32codec.c,v 1.144 2004/12/12 22:01:25 mroi Exp $ * * routines for using w32 codecs * DirectShow support by Miguel Freitas (Nov/2001) @@ -1586,7 +1586,7 @@ static void *init_video_decoder_class (xine_t *xine, void *data) { config_values_t *cfg; cfg = xine->config; - win32_def_path = cfg->register_string (cfg, "codec.win32_path", WIN32_PATH, + win32_def_path = cfg->register_string (cfg, "decoder.external.win32_codecs_path", WIN32_PATH, _("path to Win32 codecs"), _("If you have the Windows or Apple Quicktime codec packs " "installed, specify the path the codec directory here. " @@ -1663,7 +1663,7 @@ static void *init_audio_decoder_class (xine_t *xine, void *data) { this->decoder_class.dispose = dispose_class; cfg = xine->config; - win32_def_path = cfg->register_string (cfg, "codec.win32_path", WIN32_PATH, + win32_def_path = cfg->register_string (cfg, "decoder.external.win32_codecs_path", WIN32_PATH, _("path to Win32 codecs"), _("If you have the Windows or Apple Quicktime codec packs " "installed, specify the path the codec directory here. " diff --git a/src/post/goom/xine_goom.c b/src/post/goom/xine_goom.c index ec993cd51..42d017bb3 100644 --- a/src/post/goom/xine_goom.c +++ b/src/post/goom/xine_goom.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_goom.c,v 1.55 2004/11/21 15:10:40 mroi Exp $ + * $Id: xine_goom.c,v 1.56 2004/12/12 22:01:26 mroi Exp $ * * GOOM post plugin. * @@ -196,24 +196,24 @@ static void *goom_init_plugin(xine_t *xine, void *data) cfg = xine->config; - cfg->register_num (cfg, "post.goom_fps", FPS, + cfg->register_num (cfg, "effects.goom.fps", FPS, _("frames per second to generate"), _("With more frames per second, the animation will get " "smoother and faster, but will also require more CPU power."), 10, fps_changed_cb, this); - cfg->register_num (cfg, "post.goom_width", GOOM_WIDTH, + cfg->register_num (cfg, "effects.goom.width", GOOM_WIDTH, _("goom image width"), _("The width in pixels of the image to be generated."), 10, width_changed_cb, this); - cfg->register_num (cfg, "post.goom_height", GOOM_HEIGHT, + cfg->register_num (cfg, "effects.goom.height", GOOM_HEIGHT, _("goom image height"), _("The height in pixels of the image to be generated."), 10, height_changed_cb, this); - cfg->register_enum (cfg, "post.goom_csc_method", 0, + cfg->register_enum (cfg, "effects.goom.csc_method", 0, (char **)goom_csc_methods, _("colorspace conversion method"), _("You can choose the colorspace conversion method used by goom.\n" @@ -254,19 +254,19 @@ static post_plugin_t *goom_open_plugin(post_class_t *class_gen, int inputs, lprintf("goom_open_plugin\n"); - if(xine_config_lookup_entry(class->xine, "post.goom_fps", + if(xine_config_lookup_entry(class->xine, "effects.goom.fps", &fps_entry)) fps_changed_cb(class, &fps_entry); - if(xine_config_lookup_entry(class->xine, "post.goom_width", + if(xine_config_lookup_entry(class->xine, "effects.goom.width", &width_entry)) width_changed_cb(class, &width_entry); - if(xine_config_lookup_entry(class->xine, "post.goom_height", + if(xine_config_lookup_entry(class->xine, "effects.goom.height", &height_entry)) height_changed_cb(class, &height_entry); - if(xine_config_lookup_entry(class->xine, "post.goom_csc_method", + if(xine_config_lookup_entry(class->xine, "effects.goom.csc_method", &csc_method_entry)) csc_method_changed_cb(class, &csc_method_entry); diff --git a/src/post/mosaico/.cvsignore b/src/post/mosaico/.cvsignore index 1a8717a74..7d926a554 100644 --- a/src/post/mosaico/.cvsignore +++ b/src/post/mosaico/.cvsignore @@ -4,4 +4,3 @@ Makefile.in .deps *.lo *.la -test
\ No newline at end of file diff --git a/src/video_out/alphablend.c b/src/video_out/alphablend.c index 48e0bc633..03beb8605 100644 --- a/src/video_out/alphablend.c +++ b/src/video_out/alphablend.c @@ -1763,7 +1763,7 @@ void _x_alphablend_init(alphablend_t *extra_data, xine_t *xine) extra_data->buffer_size = 0; extra_data->disable_exact_blending = - config->register_bool(config, "video.disable_exact_osd_alpha_blending", 0, + config->register_bool(config, "video.output.disable_exact_alphablend", 0, _("disable exact alpha blending of overlays"), _("If you experience a performance impact when an On Screen Display or other " "overlays like DVD subtitles are active, then you might want to enable this option.\n" diff --git a/src/video_out/video_out_fb.c b/src/video_out/video_out_fb.c index 22a715ec1..46f0250fd 100644 --- a/src/video_out/video_out_fb.c +++ b/src/video_out/video_out_fb.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_fb.c,v 1.39 2004/11/24 16:11:04 mroi Exp $ + * $Id: video_out_fb.c,v 1.40 2004/12/12 22:01:27 mroi Exp $ * * video_out_fb.c, frame buffer xine driver by Miguel Freitas * @@ -786,7 +786,7 @@ static void register_callbacks(fb_driver_t *this) static int open_fb_device(config_values_t *config, xine_t *xine) { - static char devkey[] = "video.fb_device"; /* Why static? */ + static char devkey[] = "video.device.fb_device"; /* Why static? */ char *device_name; int fd; @@ -882,7 +882,7 @@ static int setup_yuv2rgb(fb_driver_t *this, config_values_t *config, this->yuv2rgb_swap = 0; this->yuv2rgb_brightness = - config->register_range(config, "video.fb_gamma", 0, + config->register_range(config, "video.output.fb_gamma", 0, -100, 100, _("brightness correction"), _("The brightness correction can be used to lighten or darken the image. " diff --git a/src/video_out/video_out_opengl.c b/src/video_out/video_out_opengl.c index 4f7dfae3a..76da13c32 100644 --- a/src/video_out/video_out_opengl.c +++ b/src/video_out/video_out_opengl.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_opengl.c,v 1.44 2004/11/25 03:29:11 dsalt Exp $ + * $Id: video_out_opengl.c,v 1.45 2004/12/12 22:01:27 mroi Exp $ * * video_out_opengl.c, OpenGL based interface for xine * @@ -1324,7 +1324,7 @@ static vo_driver_t *opengl_open_plugin (video_driver_class_t *class_gen, const v this->vo_driver.dispose = opengl_dispose; this->vo_driver.redraw_needed = opengl_redraw_needed; - this->yuv2rgb_brightness = config->register_range (config, "video.opengl_gamma", 0, + this->yuv2rgb_brightness = config->register_range (config, "video.output.opengl_gamma", 0, -128, 127, _("brightness correction"), _("The brightness correction can be used to " @@ -1347,7 +1347,7 @@ static vo_driver_t *opengl_open_plugin (video_driver_class_t *class_gen, const v this->drawable, X11OSD_SHAPED); XUnlockDisplay (this->display); - this->render_fun_id = config->register_enum (config, "video.opengl_renderer", + this->render_fun_id = config->register_enum (config, "video.output.opengl_renderer", 0, opengl_render_fun_names, _("OpenGL renderer"), _("The OpenGL plugin provides several render modules:\n\n" @@ -1364,14 +1364,14 @@ static vo_driver_t *opengl_open_plugin (video_driver_class_t *class_gen, const v "Show images reflected in a spinning torus. Way cool =)"), 10, opengl_cb_render_fun, this); this->render_min_fps = config->register_range (config, - "video.opengl_min_fps", + "video.output.opengl_min_fps", 20, 1, 120, _("OpenGL minimum framerate"), _("Minimum framerate for animated render routines.\n" "Ignored for static render routines.\n"), 20, opengl_cb_default, &this->render_min_fps); - this->render_double_buffer = config->register_bool (config, "video.opengl_double_buffer", 1, + this->render_double_buffer = config->register_bool (config, "video.device.opengl_double_buffer", 1, _("enable double buffering"), _("For OpenGL double buffering does not only remove tearing artifacts,\n" "it also reduces flickering a lot.\n" diff --git a/src/video_out/video_out_pgx64.c b/src/video_out/video_out_pgx64.c index d6409110d..1900cb5db 100644 --- a/src/video_out/video_out_pgx64.c +++ b/src/video_out/video_out_pgx64.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_pgx64.c,v 1.71 2004/11/24 16:11:05 mroi Exp $ + * $Id: video_out_pgx64.c,v 1.72 2004/12/12 22:01:27 mroi Exp $ * * video_out_pgx64.c, Sun XVR100/PGX64/PGX24 output plugin for xine * @@ -1318,20 +1318,20 @@ static void pgx64_config_changed(void *user_data, xine_cfg_entry_t *entry) vo_driver_t *this_gen = (vo_driver_t *)user_data; pgx64_driver_t *this = (pgx64_driver_t *)(void *)user_data; - if (strcmp(entry->key, "video.pgx64_colour_key") == 0) { + if (strcmp(entry->key, "video.device.pgx64_colour_key") == 0) { pgx64_set_property(this_gen, VO_PROP_COLORKEY, entry->num_value); update_colour_key_rgb(this); } - else if (strcmp(entry->key, "video.pgx64_brightness") == 0) { + else if (strcmp(entry->key, "video.output.pgx64_brightness") == 0) { pgx64_set_property(this_gen, VO_PROP_BRIGHTNESS, entry->num_value); } - else if (strcmp(entry->key, "video.pgx64_saturation") == 0) { + else if (strcmp(entry->key, "video.output.pgx64_saturation") == 0) { pgx64_set_property(this_gen, VO_PROP_SATURATION, entry->num_value); } - else if (strcmp(entry->key, "video.pgx64_overlay_mode") == 0) { + else if (strcmp(entry->key, "") == 0) { this->chromakey_en = entry->num_value; } - else if (strcmp(entry->key, "video.pgx64_multibuf_en") == 0) { + else if (strcmp(entry->key, "video.device.pgx64_multibuf_en") == 0) { this->multibuf_en = entry->num_value; } } @@ -1464,25 +1464,25 @@ static vo_driver_t *pgx64_init_driver(video_driver_class_t *class_gen, const voi break; } - this->colour_key = class->config->register_num(this->class->config, "video.pgx64_colour_key", 1, + this->colour_key = class->config->register_num(this->class->config, "video.device.pgx64_colour_key", 1, _("video overlay colour key"), _("The colour key is used to tell the graphics card where it can overlay the video image. " "Try using different values if you see the video showing through other windows."), 20, pgx64_config_changed, this); update_colour_key_rgb(this); - this->brightness = class->config->register_range(this->class->config, "video.pgx64_brightness", 0, -64, 63, + this->brightness = class->config->register_range(this->class->config, "video.output.pgx64_brightness", 0, -64, 63, _("video brightness"), _("The brightness of the video image."), 10, pgx64_config_changed, this); - this->saturation = class->config->register_range(this->class->config, "video.pgx64_saturation", 16, 0, 31, + this->saturation = class->config->register_range(this->class->config, "video.output.pgx64_saturation", 16, 0, 31, _("video saturation"), _("The saturation of the video image."), 10, pgx64_config_changed, this); - this->chromakey_en = class->config->register_bool(this->class->config, "video.pgx64_chromakey_en", 0, + this->chromakey_en = class->config->register_bool(this->class->config, "video.device.pgx64_chromakey_en", 0, _("enable chroma keying"), _("Draw OSD graphics on top of the overlay colour key rather than blend them into each frame."), 20, pgx64_config_changed, this); - this->multibuf_en = class->config->register_bool(this->class->config, "video.pgx64_multibuf_en", 1, + this->multibuf_en = class->config->register_bool(this->class->config, "video.device.pgx64_multibuf_en", 1, _("enable multi-buffering"), _("Multi buffering increases performance at the expense of using more graphics memory."), 20, pgx64_config_changed, this); diff --git a/src/video_out/video_out_sdl.c b/src/video_out/video_out_sdl.c index 1b6e7f791..d422ed76d 100644 --- a/src/video_out/video_out_sdl.c +++ b/src/video_out/video_out_sdl.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_sdl.c,v 1.41 2004/11/24 16:11:06 mroi Exp $ + * $Id: video_out_sdl.c,v 1.42 2004/12/12 22:01:28 mroi Exp $ * * video_out_sdl.c, Simple DirectMedia Layer * @@ -475,7 +475,7 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi this->sdlflags = SDL_HWSURFACE | SDL_RESIZABLE; this->hw_accel = class->config->register_bool(class->config, - "video.sdl_hw_accel", 1, + "video.device.sdl_hw_accel", 1, _("use hardware acceleration if available"), _("When your system supports it, hardware acceleration provided by your " "graphics hardware will be used. This might not work, so you can disable it, " @@ -555,7 +555,7 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi this->vo_driver.redraw_needed = sdl_redraw_needed; xprintf (this->xine, XINE_VERBOSITY_DEBUG, "video_out_sdl: warning, xine's SDL driver is EXPERIMENTAL\n"); - xprintf (this->xine, XINE_VERBOSITY_DEBUG, "video_out_sdl: in case of trouble, try setting video.sdl_hw_accel=0\n"); + xprintf (this->xine, XINE_VERBOSITY_DEBUG, "video_out_sdl: in case of trouble, try setting video.device.sdl_hw_accel=0\n"); xprintf (this->xine, XINE_VERBOSITY_LOG, _("video_out_sdl: fullscreen mode is NOT supported\n")); return &this->vo_driver; } diff --git a/src/video_out/video_out_syncfb.c b/src/video_out/video_out_syncfb.c index c689958f2..e5661af20 100644 --- a/src/video_out/video_out_syncfb.c +++ b/src/video_out/video_out_syncfb.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_syncfb.c,v 1.99 2004/11/24 16:11:06 mroi Exp $ + * $Id: video_out_syncfb.c,v 1.100 2004/12/12 22:01:28 mroi Exp $ * * video_out_syncfb.c, SyncFB (for Matrox G200/G400 cards) interface for xine * @@ -1003,7 +1003,7 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi the kernel driver is fixed... */ #if 0 this->default_repeat = config->register_range(config, - "video.syncfb_default_repeat", 3, 1, 4, + "video.device.syncfb_default_repeat", 3, 1, 4, _("default number of frame repetitions"), _("This specifies how many times a single video " "frame will be displayed consecutively."), @@ -1069,7 +1069,7 @@ static void *init_class (xine_t *xine, void *visual_gen) { char* device_name; int fd; - device_name = xine->config->register_string(xine->config, "video.syncfb_device", "/dev/syncfb", + device_name = xine->config->register_string(xine->config, "video.device.syncfb_device", "/dev/syncfb", _("SyncFB device name"), _("Specifies the file name for the SyncFB (TeleTux) device " "to be used.\nThis setting is security critical, " diff --git a/src/video_out/video_out_vidix.c b/src/video_out/video_out_vidix.c index 1df9b459b..c1d6a00d1 100644 --- a/src/video_out/video_out_vidix.c +++ b/src/video_out/video_out_vidix.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_vidix.c,v 1.66 2004/11/24 16:11:07 mroi Exp $ + * $Id: video_out_vidix.c,v 1.67 2004/12/12 22:01:29 mroi Exp $ * * video_out_vidix.c * @@ -761,15 +761,15 @@ static void vidix_ckey_callback(vo_driver_t *this_gen, xine_cfg_entry_t *entry) vidix_driver_t *this = (vidix_driver_t *) this_gen; - if(strcmp(entry->key, "video.vidix_colour_key_red") == 0) { + if(strcmp(entry->key, "video.device.vidix_colour_key_red") == 0) { this->vidix_grkey.ckey.red = entry->num_value; } - if(strcmp(entry->key, "video.vidix_colour_key_green") == 0) { + if(strcmp(entry->key, "video.device.vidix_colour_key_green") == 0) { this->vidix_grkey.ckey.green = entry->num_value; } - if(strcmp(entry->key, "video.vidix_colour_key_blue") == 0) { + if(strcmp(entry->key, "video.device.vidix_colour_key_blue") == 0) { this->vidix_grkey.ckey.blue = entry->num_value; } @@ -793,11 +793,11 @@ static void vidix_rgb_callback(vo_driver_t *this_gen, xine_cfg_entry_t *entry) { this->vidix_eq.cap = VEQ_CAP_RGB_INTENSITY; - if(!strcmp(entry->key, "video.vidix_red_intensity")) { + if(!strcmp(entry->key, "video.output.vidix_red_intensity")) { this->vidix_eq.red_intensity = entry->num_value; - } else if(!strcmp(entry->key, "video.vidix_green_intensity")) { + } else if(!strcmp(entry->key, "video.output.vidix_green_intensity")) { this->vidix_eq.green_intensity = entry->num_value; - } else if(!strcmp(entry->key, "video.vidix_blue_intensity")) { + } else if(!strcmp(entry->key, "video.output.vidix_blue_intensity")) { this->vidix_eq.blue_intensity = entry->num_value; } @@ -960,17 +960,17 @@ static vidix_driver_t *open_plugin (video_driver_class_t *class_gen) { if(this->vidix_eq.cap & VEQ_CAP_RGB_INTENSITY) { this->vidix_eq.red_intensity = config->register_range(config, - "video.vidix_red_intensity", 0, -1000, 1000, + "video.output.vidix_red_intensity", 0, -1000, 1000, _("red intensity"), _("The intensity of the red colour components."), 10, (void*) vidix_rgb_callback, this); this->vidix_eq.green_intensity = config->register_range(config, - "video.vidix_green_intensity", 0, -1000, 1000, + "video.output.vidix_green_intensity", 0, -1000, 1000, _("green intensity"), _("The intensity of the green colour components."), 10, (void*) vidix_rgb_callback, this); this->vidix_eq.blue_intensity = config->register_range(config, - "video.vidix_blue_intensity", 0, -1000, 1000, + "video.output.vidix_blue_intensity", 0, -1000, 1000, _("blue intensity"), _("The intensity of the blue colour components."), 10, (void*) vidix_rgb_callback, this); @@ -983,7 +983,7 @@ static vidix_driver_t *open_plugin (video_driver_class_t *class_gen) { /* Configuration for double buffering */ this->use_doublebuffer = config->register_bool(config, - "video.vidix_use_double_buffer", 1, _("enable double buffering"), + "video.device.vidix_double_buffer", 1, _("enable double buffering"), _("Double buffering will synchronize the update of the video image to the repainting of the entire " "screen (\"vertical retrace\"). This eliminates flickering and tearing artifacts, but will use " "more graphics memory."), 20, @@ -1125,21 +1125,21 @@ static vo_driver_t *vidix_open_plugin (video_driver_class_t *class_gen, const vo /* Colour key components */ this->vidix_grkey.ckey.red = config->register_range(config, - "video.vidix_colour_key_red", 255, 0, 255, + "video.device.vidix_colour_key_red", 255, 0, 255, _("video overlay colour key red component"), _("The colour key is used to tell the graphics card where to overlay the video image. " "Try different values, if you experience windows becoming transparent."), 20, (void*) vidix_ckey_callback, this); this->vidix_grkey.ckey.green = config->register_range(config, - "video.vidix_colour_key_green", 0, 0, 255, + "video.device.vidix_colour_key_green", 0, 0, 255, _("video overlay colour key green component"), _("The colour key is used to tell the graphics card where to overlay the video image. " "Try different values, if you experience windows becoming transparent."), 20, (void*) vidix_ckey_callback, this); this->vidix_grkey.ckey.blue = config->register_range(config, - "video.vidix_colour_key_blue", 255, 0, 255, + "video.device.vidix_colour_key_blue", 255, 0, 255, _("video overlay colour key blue component"), _("The colour key is used to tell the graphics card where to overlay the video image. " "Try different values, if you experience windows becoming transparent."), 20, @@ -1206,7 +1206,7 @@ static vo_driver_t *vidixfb_open_plugin (video_driver_class_t *class_gen, const this->visual_type = XINE_VISUAL_TYPE_FB; /* Register config option for fb device */ - device = config->register_string(config, "video.vidixfb_device", "/dev/fb0", + device = config->register_string(config, "video.device.vidixfb_device", "/dev/fb0", _("framebuffer device name"), _("Specifies the file name for the framebuffer device to be used.\n" "This setting is security critical, because when changed to a different file, xine " diff --git a/src/video_out/video_out_xshm.c b/src/video_out/video_out_xshm.c index 43ec06d14..35efb7107 100644 --- a/src/video_out/video_out_xshm.c +++ b/src/video_out/video_out_xshm.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_xshm.c,v 1.137 2004/11/24 16:11:08 mroi Exp $ + * $Id: video_out_xshm.c,v 1.138 2004/12/12 22:01:29 mroi Exp $ * * video_out_xshm.c, X11 shared memory extension interface for xine * @@ -1236,7 +1236,7 @@ static vo_driver_t *xshm_open_plugin (video_driver_class_t *class_gen, const voi this->yuv2rgb_mode = mode; this->yuv2rgb_swap = swapped; - this->yuv2rgb_brightness = config->register_range (config, "video.xshm_gamma", 0, + this->yuv2rgb_brightness = config->register_range (config, "video.output.xshm_gamma", 0, -128, 127, _("brightness correction"), _("The brightness correction can be used to " diff --git a/src/video_out/video_out_xv.c b/src/video_out/video_out_xv.c index 9ea754708..fbcea7061 100644 --- a/src/video_out/video_out_xv.c +++ b/src/video_out/video_out_xv.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_xv.c,v 1.207 2004/12/08 22:40:32 miguelfreitas Exp $ + * $Id: video_out_xv.c,v 1.208 2004/12/12 22:01:29 mroi Exp $ * * video_out_xv.c, X11 video extension interface for xine * @@ -1419,7 +1419,7 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi } else if(!strcmp(attr[k].name, "XV_COLORKEY")) { xv_check_capability (this, VO_PROP_COLORKEY, attr[k], adaptor_info[adaptor_num].base_id, - "video.xv_colorkey", + "video.device.xv_colorkey", _("video overlay colour key"), _("The colour key is used to tell the graphics card where to " "overlay the video image. Try different values, if you experience " @@ -1428,14 +1428,14 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi } else if(!strcmp(attr[k].name, "XV_AUTOPAINT_COLORKEY")) { xv_check_capability (this, VO_PROP_AUTOPAINT_COLORKEY, attr[k], adaptor_info[adaptor_num].base_id, - "video.xv_autopaint_colorkey", + "video.device.xv_autopaint_colorkey", _("autopaint colour key"), _("Make Xv autopaint its colorkey.")); } else if(!strcmp(attr[k].name, "XV_FILTER")) { int xv_filter; /* This setting is specific to Permedia 2/3 cards. */ - xv_filter = config->register_range (config, "video.XV_FILTER", 0, + xv_filter = config->register_range (config, "video.device.xv_filter", 0, attr[k].min_value, attr[k].max_value, _("bilinear scaling mode"), _("Selects the bilinear scaling mode for Permedia cards. " @@ -1448,17 +1448,17 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi "1 - horizontal linear filtering\n" "2 - enable full bilinear filtering"), 20, xv_update_XV_FILTER, this); - config->update_num(config,"video.XV_FILTER",xv_filter); + config->update_num(config,"video.device.xv_filter",xv_filter); } else if(!strcmp(attr[k].name, "XV_DOUBLE_BUFFER")) { int xv_double_buffer; xv_double_buffer = - config->register_bool (config, "video.XV_DOUBLE_BUFFER", 1, + config->register_bool (config, "video.device.xv_double_buffer", 1, _("enable double buffering"), _("Double buffering will synchronize the update of the video image to the " "repainting of the entire screen (\"vertical retrace\"). This eliminates " "flickering and tearing artifacts, but will use more graphics memory."), 20, xv_update_XV_DOUBLE_BUFFER, this); - config->update_num(config,"video.XV_DOUBLE_BUFFER",xv_double_buffer); + config->update_num(config,"video.device.xv_double_buffer",xv_double_buffer); } } } @@ -1513,13 +1513,13 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi XUnlockDisplay (this->display); this->use_pitch_alignment = - config->register_bool (config, "video.xv_pitch_alignment", 0, + config->register_bool (config, "video.device.xv_pitch_alignment", 0, _("pitch alignment workaround"), _("Some buggy video drivers need a workaround to function properly."), 10, xv_update_xv_pitch_alignment, this); this->deinterlace_method = - config->register_enum (config, "video.deinterlace_method", 4, + config->register_enum (config, "video.output.xv_deinterlace_method", 4, deinterlace_methods, _("deinterlace method (deprecated)"), _("This config setting is deprecated. You should use the new deinterlacing " diff --git a/src/video_out/video_out_xvmc.c b/src/video_out/video_out_xvmc.c index 10c6b0a20..d71feceae 100644 --- a/src/video_out/video_out_xvmc.c +++ b/src/video_out/video_out_xvmc.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_xvmc.c,v 1.19 2004/11/24 16:11:09 mroi Exp $ + * $Id: video_out_xvmc.c,v 1.20 2004/12/12 22:01:29 mroi Exp $ * * video_out_xvmc.c, X11 video motion compensation extension interface for xine * @@ -1501,7 +1501,7 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi } else if(!strcmp(attr[k].name, "XV_COLORKEY")) { xvmc_check_capability (this, VO_PROP_COLORKEY, attr[k], class->adaptor_info[class->adaptor_num].base_id, "XV_COLORKEY", - "video.xv_colorkey", + "video.device.xv_colorkey", _("video overlay colour key"), _("The colour key is used to tell the graphics card where to " "overlay the video image. Try different values, if you experience " @@ -1510,19 +1510,19 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi } else if(!strcmp(attr[k].name, "XV_AUTOPAINT_COLORKEY")) { xvmc_check_capability (this, VO_PROP_AUTOPAINT_COLORKEY, attr[k], class->adaptor_info[class->adaptor_num].base_id, "XV_AUTOPAINT_COLORKEY", - "video.xv_autopaint_colorkey", + "video.device.xv_autopaint_colorkey", _("autopaint colour key"), _("Make Xv autopaint its colorkey.")); } else if(!strcmp(attr[k].name, "XV_DOUBLE_BUFFER")) { int xvmc_double_buffer; - xvmc_double_buffer = config->register_bool (config, "video.XV_DOUBLE_BUFFER", 1, + xvmc_double_buffer = config->register_bool (config, "video.device.xv_double_buffer", 1, _("enable double buffering"), _("Double buffering will synchronize the update of the video image to the " "repainting of the entire screen (\"vertical retrace\"). This eliminates " "flickering and tearing artifacts, but will use more graphics memory."), 20, xvmc_update_XV_DOUBLE_BUFFER, this); - config->update_num(config,"video.XV_DOUBLE_BUFFER",xvmc_double_buffer); + config->update_num(config,"video.device.xv_double_buffer",xvmc_double_buffer); } } } @@ -1578,7 +1578,7 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi */ this->deinterlace_method = - config->register_enum (config, "video.deinterlace_method", 4, + config->register_enum (config, "video.output.xv_deinterlace_method", 4, deinterlace_methods, _("deinterlace method (deprecated)"), _("This config setting is deprecated. You should use the new deinterlacing " diff --git a/src/video_out/video_out_xxmc.c b/src/video_out/video_out_xxmc.c index d0dfaa3b7..e2bb7e280 100644 --- a/src/video_out/video_out_xxmc.c +++ b/src/video_out/video_out_xxmc.c @@ -18,7 +18,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_xxmc.c,v 1.10 2004/11/24 16:11:10 mroi Exp $ + * $Id: video_out_xxmc.c,v 1.11 2004/12/12 22:01:30 mroi Exp $ * * video_out_xxmc.c, X11 decoding accelerated video extension interface for xine * @@ -2302,7 +2302,7 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi } else if(!strcmp(attr[k].name, "XV_COLORKEY")) { xxmc_check_capability (this, VO_PROP_COLORKEY, attr[k], adaptor_info[adaptor_num].base_id, "XV_COLORKEY", - "video.xv_colorkey", + "video.device.xv_colorkey", _("video overlay colour key"), _("The colour key is used to tell the graphics card where to " "overlay the video image. Try different values, if you experience " @@ -2311,14 +2311,14 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi } else if(!strcmp(attr[k].name, "XV_AUTOPAINT_COLORKEY")) { xxmc_check_capability (this, VO_PROP_AUTOPAINT_COLORKEY, attr[k], adaptor_info[adaptor_num].base_id, "XV_AUTOPAINT_COLORKEY", - "video.xv_autopaint_colorkey", + "video.device.xv_autopaint_colorkey", _("autopaint colour key"), _("Make Xv autopaint its colorkey.")); } else if(!strcmp(attr[k].name, "XV_FILTER")) { int xv_filter; /* This setting is specific to Permedia 2/3 cards. */ - xv_filter = config->register_range (config, "video.XV_FILTER", 0, + xv_filter = config->register_range (config, "video.device.xv_filter", 0, attr[k].min_value, attr[k].max_value, _("bilinear scaling mode"), _("Selects the bilinear scaling mode for Permedia cards. " @@ -2331,17 +2331,17 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi "1 - horizontal linear filtering\n" "2 - enable full bilinear filtering"), 20, xxmc_update_XV_FILTER, this); - config->update_num(config,"video.XV_FILTER",xv_filter); + config->update_num(config,"video.device.xv_filter",xv_filter); } else if(!strcmp(attr[k].name, "XV_DOUBLE_BUFFER")) { int xv_double_buffer; xv_double_buffer = - config->register_bool (config, "video.XV_DOUBLE_BUFFER", 1, + config->register_bool (config, "video.device.xv_double_buffer", 1, _("enable double buffering"), _("Double buffering will synchronize the update of the video image to the " "repainting of the entire screen (\"vertical retrace\"). This eliminates " "flickering and tearing artifacts, but will use more graphics memory."), 20, xxmc_update_XV_DOUBLE_BUFFER, this); - config->update_num(config,"video.XV_DOUBLE_BUFFER",xv_double_buffer); + config->update_num(config,"video.device.xv_double_buffer",xv_double_buffer); } } } @@ -2404,27 +2404,27 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi XUnlockDisplay (this->display); this->use_pitch_alignment = - config->register_bool (config, "video.xv_pitch_alignment", 0, + config->register_bool (config, "video.device.xv_pitch_alignment", 0, _("pitch alignment workaround"), _("Some buggy video drivers need a workaround to function properly."), 10, xxmc_update_xv_pitch_alignment, this); use_more_frames= - config->register_bool (config, "video.xvmc_more_frames", 0, + config->register_bool (config, "video.device.xvmc_more_frames", 0, _("Make XvMC allocate more frames for better buffering."), _("Some XvMC implementations allow more than 8 frames.\n" "This option, when turned on, makes the driver try to\n" "allocate 15 frames. A must for unichrome and live VDR.\n"), 10, NULL, this); this->cpu_save_enabled = - config->register_bool (config, "video.unichrome_cpu_save", 0, + config->register_bool (config, "video.device.unichrome_cpu_save", 0, _("Unichrome cpu save"), _("Saves CPU time by sleeping while decoder works.\n" "Only for Linux kernel 2.6 series or 2.4 with multimedia patch.\n" "Experimental.\n"), 10, xxmc_update_cpu_save, this); this->reverse_nvidia_palette = - config->register_bool (config, "video.xvmc_nvidia_color_fix", 0, + config->register_bool (config, "video.device.xvmc_nvidia_color_fix", 0, _("Fix buggy NVIDIA XvMC subpicture colors"), _("There's a bug in NVIDIA's XvMC lib that makes red OSD colors\n" "look blue and vice versa. This option provides a workaround.\n"), 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 " diff --git a/src/xine-utils/memcpy.c b/src/xine-utils/memcpy.c index 79a74c9d5..c90322848 100644 --- a/src/xine-utils/memcpy.c +++ b/src/xine-utils/memcpy.c @@ -476,7 +476,7 @@ void xine_probe_fast_memcpy(xine_t *xine) config_flags = xine_mm_accel(); - best = xine->config->register_enum (xine->config, "misc.memcpy_method", 0, + best = xine->config->register_enum (xine->config, "engine.performance.memcpy_method", 0, memcpy_methods, _("memcopy method used by xine"), _("The copying of large memory blocks is one of the most " @@ -532,7 +532,7 @@ void xine_probe_fast_memcpy(xine_t *xine) best = i; } - xine->config->update_num (xine->config, "misc.memcpy_method", best); + xine->config->update_num (xine->config, "engine.performance.memcpy_method", best); free(buf1); free(buf2); diff --git a/win32/contrib/pthreads/config.h.in b/win32/contrib/pthreads/config.h.in index dad5a212d..11c03c4dc 100644 --- a/win32/contrib/pthreads/config.h.in +++ b/win32/contrib/pthreads/config.h.in @@ -58,4 +58,4 @@ #define HAVE_MODE_T
#endif
-#endif
\ No newline at end of file +#endif |