Author: diego Date: Wed Jul 30 14:01:30 2008 New Revision: 27373 Log: Start unifying names of internal preprocessor directives. Replace all USE_ prefixes by CONFIG_ prefixes to indicate options which are configurable. Modified: trunk/help/help_mp-bg.h trunk/help/help_mp-cs.h trunk/help/help_mp-de.h trunk/help/help_mp-dk.h trunk/help/help_mp-el.h trunk/help/help_mp-es.h trunk/help/help_mp-fr.h trunk/help/help_mp-hu.h trunk/help/help_mp-it.h trunk/help/help_mp-ja.h trunk/help/help_mp-ko.h trunk/help/help_mp-mk.h trunk/help/help_mp-nb.h trunk/help/help_mp-nl.h trunk/help/help_mp-pl.h trunk/help/help_mp-pt_BR.h trunk/help/help_mp-ro.h trunk/help/help_mp-ru.h trunk/help/help_mp-sk.h trunk/help/help_mp-sv.h trunk/help/help_mp-tr.h trunk/help/help_mp-uk.h trunk/help/help_mp-zh_CN.h trunk/help/help_mp-zh_TW.h Changes in other areas also in this revision: Modified: trunk/cfg-common-opts.h trunk/cfg-common.h trunk/cfg-mencoder.h trunk/cfg-mplayer.h trunk/command.c trunk/configure trunk/get_path.c trunk/gui/cfg.c trunk/gui/cfg.h trunk/gui/interface.c trunk/gui/interface.h trunk/gui/mplayer/gtk/menu.c trunk/gui/mplayer/gtk/opts.c trunk/gui/mplayer/gui_common.c trunk/gui/mplayer/mw.c trunk/gui/mplayer/play.c trunk/gui/win32/dialogs.c trunk/gui/win32/gui.c trunk/gui/win32/interface.c trunk/gui/win32/widgetrender.c trunk/help/help_mp-en.h trunk/input/input.c trunk/libaf/af.c trunk/libao2/audio_out.c trunk/libass/ass.c trunk/libass/ass_mp.c trunk/libmenu/menu.c trunk/libmpcodecs/ad.c trunk/libmpcodecs/ad_faad.c trunk/libmpcodecs/ad_mp3lib.c trunk/libmpcodecs/ad_realaud.c trunk/libmpcodecs/ae.c trunk/libmpcodecs/ae_lavc.c trunk/libmpcodecs/dec_audio.c trunk/libmpcodecs/dec_video.c trunk/libmpcodecs/vd.c trunk/libmpcodecs/vd_ffmpeg.c trunk/libmpcodecs/vd_realvid.c trunk/libmpcodecs/ve.c trunk/libmpcodecs/ve_lavc.c trunk/libmpcodecs/vf.c trunk/libmpcodecs/vf_pp.c trunk/libmpcodecs/vf_vo.c trunk/libmpdemux/demux_mkv.c trunk/libmpdemux/demux_mov.c trunk/libmpdemux/demux_ogg.c trunk/libmpdemux/demux_rtp.cpp trunk/libmpdemux/demux_rtp_codec.cpp trunk/libmpdemux/demux_rtp_internal.h trunk/libmpdemux/demuxer.c trunk/libmpdemux/demuxer.h trunk/libmpdemux/extension.c trunk/libmpdemux/muxer.c trunk/libmpdemux/muxer_mpeg.c trunk/libmpdemux/stheader.h trunk/libvo/aclib.c trunk/libvo/fastmemcpy.h trunk/libvo/font_load_ft.c trunk/libvo/sub.c trunk/libvo/sub.h trunk/loader/win32.c trunk/mencoder.c trunk/mp3lib/decod386.c trunk/mp3lib/mp3.h trunk/mp3lib/sr1.c trunk/mp3lib/test.c trunk/mp3lib/test2.c trunk/mp_core.h trunk/mp_msg.c trunk/mpcommon.c trunk/mplayer.c trunk/osdep/getch2-os2.c trunk/osdep/getch2-win.c trunk/osdep/getch2.c trunk/stream/asf_mmst_streaming.c trunk/stream/audio_in.c trunk/stream/audio_in.h trunk/stream/librtsp/rtsp_rtp.c trunk/stream/network.c trunk/stream/stream.c trunk/stream/stream.h trunk/stream/stream_dvd.h trunk/stream/stream_dvd_common.c trunk/stream/stream_dvd_common.h trunk/stream/stream_radio.c trunk/stream/tcp.c trunk/stream/tvi_bsdbt848.c trunk/stream/udp.c trunk/subreader.c trunk/vobsub.c Modified: trunk/help/help_mp-bg.h ============================================================================== --- trunk/help/help_mp-bg.h (original) +++ trunk/help/help_mp-bg.h Wed Jul 30 14:01:30 2008 @@ -15,7 +15,7 @@ static char help_text[]= #ifdef HAVE_VCD " vcd://<пътечка> пуска (S)VCD (Super Video CD) пътечка (без монтиране!)\n" #endif -#ifdef USE_DVDREAD +#ifdef CONFIG_DVDREAD " dvd://<номер> пуска DVD заглавие от устройство, вместо от файл\n" " -alang/-slang избор на език за DVD аудиo/субтитри (чрез 2-буквен код)\n" #endif Modified: trunk/help/help_mp-cs.h ============================================================================== --- trunk/help/help_mp-cs.h (original) +++ trunk/help/help_mp-cs.h Wed Jul 30 14:01:30 2008 @@ -15,7 +15,7 @@ static char help_text[]= " vcd://<č_stopy> přehraje (S)VCD (Super Video CD) stopu (z nepřipojeného\n" " zařízení)\n" #endif -#ifdef USE_DVDREAD +#ifdef CONFIG_DVDREAD " dvd://<č_tit> přehraje DVD titul ze zařízení (mechaniky), místo ze souboru\n" " -alang/-slang zvolí jazyk zvuku/titulků na DVD (dvouznakový kód země)\n" #endif Modified: trunk/help/help_mp-de.h ============================================================================== --- trunk/help/help_mp-de.h (original) +++ trunk/help/help_mp-de.h Wed Jul 30 14:01:30 2008 @@ -22,7 +22,7 @@ static char help_text[]= " vcd://<tracknr> Spiele einen (S)VCD-Titel (Super Video CD) ab\n" " ( direkter Gerätezugriff, kein mount! )\n" #endif -#ifdef USE_DVDREAD +#ifdef CONFIG_DVDREAD " dvd://<titelnr> Spiele DVD-Titel direkt vom Gerät anstelle einer Datei\n" #endif " -alang/-slang Wähle DVD Audio/Untertitel Sprache (2-Zeichen-Ländercode)\n" Modified: trunk/help/help_mp-dk.h ============================================================================== --- trunk/help/help_mp-dk.h (original) +++ trunk/help/help_mp-dk.h Wed Jul 30 14:01:30 2008 @@ -16,7 +16,7 @@ static char help_text[]= #ifdef HAVE_VCD " vcd://<spor> afspil et VCD (Video CD) spor fra et drev i stedet for en fil\n" #endif -#ifdef USE_DVDREAD +#ifdef CONFIG_DVDREAD " dvd://<titelnr> afspil DVD titel fra et drev i stedet for en fil\n" " -alang/-slang vælg sprog til lyd og undertekster (vha. landekode på 2 tegn)\n" #endif Modified: trunk/help/help_mp-el.h ============================================================================== --- trunk/help/help_mp-el.h (original) +++ trunk/help/help_mp-el.h Wed Jul 30 14:01:30 2008 @@ -14,7 +14,7 @@ static char help_text[]= #ifdef HAVE_VCD " vcd://<αριθμός track> αναπαραγωγή track VCD (video cd) από συσκευή αντί για αρχείο\n" #endif -#ifdef USE_DVDREAD +#ifdef CONFIG_DVDREAD " dvd://<titleno> αναπαραγωγή του τίτλου/track DVD από τη συσκευή αντί για αρχείο\n" " -alang/-slang επιλογή της γλώσσας του ήχου/υποτίτλων του DVD (2 χαρακτήρες του κωδικού της χώρας)\n" #endif Modified: trunk/help/help_mp-es.h ============================================================================== --- trunk/help/help_mp-es.h (original) +++ trunk/help/help_mp-es.h Wed Jul 30 14:01:30 2008 @@ -25,7 +25,7 @@ static char help_text[]= #ifdef HAVE_VCD " vcd://<numpista> Reproducir pista de (S)VCD (Super Video CD) (acceso directo al dispositivo, no montado)\n" #endif -#ifdef USE_DVDREAD +#ifdef CONFIG_DVDREAD " dvd://<número> Reproducir título o pista de DVD desde un dispositivo en vez de un archivo regular.\n" " -alang <lengua> Seleccionar lengua para el audio del DVD (con código de país de dos caracteres. p. ej. 'es').\n" " -alang <lengua> Seleccionar lengua para los subtítulos del DVD.\n" Modified: trunk/help/help_mp-fr.h ============================================================================== --- trunk/help/help_mp-fr.h (original) +++ trunk/help/help_mp-fr.h Wed Jul 30 14:01:30 2008 @@ -17,7 +17,7 @@ static char help_text[]= #ifdef HAVE_VCD " vcd://<n°piste> lit piste (S)VCD (Super Video CD) (périf. brut, non-monté)\n" #endif -#ifdef USE_DVDREAD +#ifdef CONFIG_DVDREAD " dvd://<n°titre> lit titre DVD du périf. plutôt que d'un fichier\n" " -alang/-slang langue audio/sous-titres du DVD (code pays 2 lettres)\n" #endif Modified: trunk/help/help_mp-hu.h ============================================================================== --- trunk/help/help_mp-hu.h (original) +++ trunk/help/help_mp-hu.h Wed Jul 30 14:01:30 2008 @@ -18,7 +18,7 @@ static char help_text[]= #ifdef HAVE_VCD " vcd://<sávszám> (S)VCD (Super Video CD) sáv lejátszás (nyers, nincs mount)\n" #endif -#ifdef USE_DVDREAD +#ifdef CONFIG_DVDREAD " dvd://<titleno> a megadott DVD sáv lejátszása, fájl helyett\n" #endif " -alang/-slang DVD audio/felirat nyelv kiválasztása (2 betűs országkóddal)\n" Modified: trunk/help/help_mp-it.h ============================================================================== --- trunk/help/help_mp-it.h (original) +++ trunk/help/help_mp-it.h Wed Jul 30 14:01:30 2008 @@ -16,7 +16,7 @@ static char help_text[]= #ifdef HAVE_VCD " vcd://<trackno> legge (S)VCD (Super Video CD) (dispositivo raw, non montato)\n" #endif -#ifdef USE_DVDREAD +#ifdef CONFIG_DVDREAD " dvd://<titleno> legge titolo/traccia DVD dal dispositivo anzich� da file\n" " -alang/-slang sceglie lingua audio/sottotitoli DVD (cod naz. 2 caratteri)\n" #endif Modified: trunk/help/help_mp-ja.h ============================================================================== --- trunk/help/help_mp-ja.h (original) +++ trunk/help/help_mp-ja.h Wed Jul 30 14:01:30 2008 @@ -15,7 +15,7 @@ static char help_text[]= #ifdef HAVE_VCD " vcd://<trackno> play VCD (Video CD) track from device instead of plain file\n" #endif -#ifdef USE_DVDREAD +#ifdef CONFIG_DVDREAD " dvd://<titleno> play DVD title from device instead of plain file\n" " -alang/-slang DVDの 音声/サブタイトル 言語設定 (2文字のカントリーコードで指定)\n" #endif Modified: trunk/help/help_mp-ko.h ============================================================================== --- trunk/help/help_mp-ko.h (original) +++ trunk/help/help_mp-ko.h Wed Jul 30 14:01:30 2008 @@ -13,7 +13,7 @@ static char help_text[]= #ifdef HAVE_VCD " vcd://<trackno> (S)VCD (Super Video CD) 트랙 재생 (장치로부터, 마운트 없이)\n" #endif -#ifdef USE_DVDREAD +#ifdef CONFIG_DVDREAD " dvd://<titleno> 일반 파일이 아닌 장치로부터 DVD 타이틀 재생\n" " -alang/-slang DVD 오디오/자막 언어 선택 (두 글자의 국가 코드)\n" #endif Modified: trunk/help/help_mp-mk.h ============================================================================== --- trunk/help/help_mp-mk.h (original) +++ trunk/help/help_mp-mk.h Wed Jul 30 14:01:30 2008 @@ -14,7 +14,7 @@ static char help_text[]= #ifdef HAVE_VCD " vcd://<trackno> пушта VCD (Video CD) од уред наместо од датотека\n" #endif -#ifdef USE_DVDREAD +#ifdef CONFIG_DVDREAD " dvd://<titleno> пушта DVD наслови од уред наместо од датотека\n" " -alang/-slang избира јазик на DVD аудио/превод (од 2-char код на државата)\n" #endif Modified: trunk/help/help_mp-nb.h ============================================================================== --- trunk/help/help_mp-nb.h (original) +++ trunk/help/help_mp-nb.h Wed Jul 30 14:01:30 2008 @@ -11,7 +11,7 @@ static char help_text[]= " -vo <drv[:dev]> velg video-ut driver og enhet (se '-vo help' for liste)\n" " -ao <drv[:dev]> velg lyd-ut driver og enhet (se '-ao help' for liste)\n" " vcd://<sporno> spill VCD (video cd) spor fra enhet i stedet for fil\n" -#ifdef USE_DVDREAD +#ifdef CONFIG_DVDREAD " dvd://<tittelno> spill DVD tittel/spor fra enhet i stedet for fil\n" #endif " -ss <timepos> søk til gitt (sekunder eller hh:mm:ss) posisjon\n" Modified: trunk/help/help_mp-nl.h ============================================================================== --- trunk/help/help_mp-nl.h (original) +++ trunk/help/help_mp-nl.h Wed Jul 30 14:01:30 2008 @@ -12,7 +12,7 @@ static char help_text[]= #ifdef HAVE_VCD " vcd://<trackno> speel VCD (Video CD) track van cdrom in plaats van standaard bestand\n" #endif -#ifdef USE_DVDREAD +#ifdef CONFIG_DVDREAD " dvd://<titelnr> speel DVD titel/track van device in plaats van gewoon bestand\n" " -alang/-slang selecteer DVD audio/ondertitelingstaal (door middel van 2-karakter landcode)\n" #endif Modified: trunk/help/help_mp-pl.h ============================================================================== --- trunk/help/help_mp-pl.h (original) +++ trunk/help/help_mp-pl.h Wed Jul 30 14:01:30 2008 @@ -15,7 +15,7 @@ static char help_text[]= #ifdef HAVE_VCD " vcd://<numer_ścieżki> odtwórz ścieżkę (S)VCD (Super Video CD) (bezpośrednio, bez montowania)\n" #endif -#ifdef USE_DVDREAD +#ifdef CONFIG_DVDREAD " dvd://<tytuł> odtwórz tytuł DVD z urządzenia zamiast pliku\n" " -alang/-slang wybierz język napisów/ścieżki dźwiękowej (dwuliterowy kod kraju)\n" #endif Modified: trunk/help/help_mp-pt_BR.h ============================================================================== --- trunk/help/help_mp-pt_BR.h (original) +++ trunk/help/help_mp-pt_BR.h Wed Jul 30 14:01:30 2008 @@ -18,7 +18,7 @@ static char help_text[]= " vcd://<numtrilha> reproduz trilha de VCD (Video CD) do dispositivo em vez de um\n" " arquivo\n" #endif -#ifdef USE_DVDREAD +#ifdef CONFIG_DVDREAD " dvd://<numtítilo> reproduz título de DVD do dispositivo em vez de um arquivo\n" " -alang/-slang seleciona o idioma/legenda do DVD (pelo código país de duas\n" " letras)\n" Modified: trunk/help/help_mp-ro.h ============================================================================== --- trunk/help/help_mp-ro.h (original) +++ trunk/help/help_mp-ro.h Wed Jul 30 14:01:30 2008 @@ -22,7 +22,7 @@ static char help_text[]= " vcd://<nrpistã> ruleazã pista VCD (Video CD) de pe device în loc de fiºier\n" #endif -#ifdef USE_DVDREAD +#ifdef CONFIG_DVDREAD " dvd://<nrtitlu> ruleazã titlul/pista de pe dispozitivul DVD în loc de fiºier\n" " -aLMB/-sLMB alege limba pentru audio/subtitrãri DVD\n" " (cu codul de 2 caractere, ex. RO)\n" Modified: trunk/help/help_mp-ru.h ============================================================================== --- trunk/help/help_mp-ru.h (original) +++ trunk/help/help_mp-ru.h Wed Jul 30 14:01:30 2008 @@ -16,7 +16,7 @@ static char help_text[]= #ifdef HAVE_VCD " vcd://<номер трека> играть дорожку (S)VCD (Super Video CD) (указывайте устройство,\n не монтируйте его)\n" #endif -#ifdef USE_DVDREAD +#ifdef CONFIG_DVDREAD " dvd://<номер ролика> играть DVD ролик с устройства вместо файла\n" " -alang/-slang выбрать язык аудио/субтитров DVD (двубуквенный код страны)\n" #endif Modified: trunk/help/help_mp-sk.h ============================================================================== --- trunk/help/help_mp-sk.h (original) +++ trunk/help/help_mp-sk.h Wed Jul 30 14:01:30 2008 @@ -16,7 +16,7 @@ static char help_text[]= #ifdef HAVE_VCD " vcd://<trackno> prehrať VCD (video cd) stopu zo zariadenia namiesto zo súboru\n" #endif -#ifdef USE_DVDREAD +#ifdef CONFIG_DVDREAD " dvd://<titleno> prehrať DVD titul/stopu zo zariadenia (mechaniky) namiesto súboru\n" " -alang/-slang vybrať jazyk DVD zvuku/titulkov(pomocou 2-miest. kódu krajiny)\n" #endif Modified: trunk/help/help_mp-sv.h ============================================================================== --- trunk/help/help_mp-sv.h (original) +++ trunk/help/help_mp-sv.h Wed Jul 30 14:01:30 2008 @@ -13,7 +13,7 @@ static char help_text[]= #ifdef HAVE_VCD " vcd://<spårnr> spela (S)VCD (Super Video CD) spår (rå enhet, ingen montering)\n" #endif -#ifdef USE_DVDREAD +#ifdef CONFIG_DVDREAD " dvd://<titlenr> spela DVD titel från enhet istället för ifrån en enkel fil\n" " -alang/-slang välj DVD audio/textningsspråk (m.h.a. ett 2-teckens landskod)\n" #endif Modified: trunk/help/help_mp-tr.h ============================================================================== --- trunk/help/help_mp-tr.h (original) +++ trunk/help/help_mp-tr.h Wed Jul 30 14:01:30 2008 @@ -16,7 +16,7 @@ static char help_text[]= #ifdef HAVE_VCD " vcd://<parçano> (S)VCD (Süper Video CD) parça numarasını oynatır (sade aygıtı kullan, sisteme takma)\n" #endif -#ifdef USE_DVDREAD +#ifdef CONFIG_DVDREAD " dvd://<başlıkno> Dosya yerine aygıttan DVD başlığını oynatır.\n" " -alang/-slang DVD ses/altyazı dili seçer (2 karakterli ülke kodu ile)\n" #endif Modified: trunk/help/help_mp-uk.h ============================================================================== --- trunk/help/help_mp-uk.h (original) +++ trunk/help/help_mp-uk.h Wed Jul 30 14:01:30 2008 @@ -13,7 +13,7 @@ static char help_text[]= #ifdef HAVE_VCD " vcd://<номер треку> грати VCD (video cd) трек з пристрою замість файлу\n" #endif -#ifdef USE_DVDREAD +#ifdef CONFIG_DVDREAD " dvd://<номер титрів> грати DVD титри/трек з пристрою замість файлу\n" " -alang/-slang вибрати мову DVD аудіо/субтитрів (двосимвольний код країни)\n" #endif Modified: trunk/help/help_mp-zh_CN.h ============================================================================== --- trunk/help/help_mp-zh_CN.h (original) +++ trunk/help/help_mp-zh_CN.h Wed Jul 30 14:01:30 2008 @@ -26,7 +26,7 @@ static char help_text[]= #ifdef HAVE_VCD " vcd://<曲目号> 播放 (S)VCD（超级VCD）曲目（无格式设备，无需装载）\n" #endif -#ifdef USE_DVDREAD +#ifdef CONFIG_DVDREAD " dvd://<标题号> 从设备而不是从普通文件上播放 DVD 标题\n" #endif " -alang/-slang 选择 DVD 音频/字幕的语言（使用两字符的国家代号）\n" Modified: trunk/help/help_mp-zh_TW.h ============================================================================== --- trunk/help/help_mp-zh_TW.h (original) +++ trunk/help/help_mp-zh_TW.h Wed Jul 30 14:01:30 2008 @@ -18,7 +18,7 @@ static char help_text[]= #ifdef HAVE_VCD " vcd://<trackno> 播放 (S)VCD 軌迹號 (原始設備, 無需安挂)\n" #endif -#ifdef USE_DVDREAD +#ifdef CONFIG_DVDREAD " dvd://<titleno> 從設備而不是普通文件上播放 DVD 標題號\n" " -alang/-slang 選擇 DVD 音軌/字幕的語言(使用兩字符的國家代號)\n" #endif