Sun Aug 3 17:21:42 CEST 2008

Author: diego
Date: Sun Aug  3 17:21:40 2008
New Revision: 27402

Log:
Change a bunch of video/audio-output-specific preprocessor directives from
a HAVE_ prefix to a CONFIG_ prefix.


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-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/Makefile
   trunk/cfg-common-opts.h
   trunk/cfg-common.h
   trunk/cfg-mplayer.h
   trunk/command.c
   trunk/configure
   trunk/gui/cfg.c
   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/help/help_mp-en.h
   trunk/input/input.c
   trunk/libao2/audio_out.c
   trunk/libmenu/menu.c
   trunk/libmpcodecs/vd.c
   trunk/libmpcodecs/vf.c
   trunk/libmpdemux/demuxer.h
   trunk/libvo/sub.c
   trunk/libvo/video_out.c
   trunk/libvo/vo_macosx.m
   trunk/libvo/vo_quartz.c
   trunk/mp_core.h
   trunk/mpcommon.c
   trunk/mplayer.c
   trunk/stream/dvb_tune.c
   trunk/stream/dvbin.h
   trunk/stream/stream.c
   trunk/stream/stream_dvb.c
   trunk/stream/stream_radio.c
   trunk/stream/stream_radio.h
   trunk/stream/tv.c
   trunk/stream/tvi_dshow.c
   trunk/stream/tvi_v4l.c
   trunk/stream/tvi_v4l2.c

Modified: trunk/help/help_mp-bg.h
==============================================================================

--- trunk/help/help_mp-bg.h	(original)
+++ trunk/help/help_mp-bg.h	Sun Aug  3 17:21:40 2008
@@ -12,7 +12,7 @@ static char help_text[]=
 "Основни опции:   (пълният списък е в ръководството - 'man mplayer')\n"
 " -vo <дрв[:устр]>  избор на видео драйвер & устройство ('-vo help' дава списък)\n"
 " -ao <дрв[:устр]>  избор на звуков драйвер & устройство ('-ao help' дава списък)\n"
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
 " vcd://<пътечка>   пуска (S)VCD (Super Video CD) пътечка (без монтиране!)\n"
 #endif
 #ifdef CONFIG_DVDREAD

Modified: trunk/help/help_mp-cs.h
==============================================================================
--- trunk/help/help_mp-cs.h	(original)
+++ trunk/help/help_mp-cs.h	Sun Aug  3 17:21:40 2008
@@ -11,7 +11,7 @@ static char help_text[]=
 "Základní volby: (úplný seznam najdete v manuálové stránce)\n"
 " -vo <rozhraní>   vybere výstupní video rozhraní (seznam: -vo help)\n"
 " -ao <rozhraní>   vybere výstupní audio rozhraní (seznam: -ao help)\n"
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
 " vcd://<č_stopy>  přehraje (S)VCD (Super Video CD) stopu (z nepřipojeného\n"
 "                  zařízení)\n"
 #endif

Modified: trunk/help/help_mp-de.h
==============================================================================
--- trunk/help/help_mp-de.h	(original)
+++ trunk/help/help_mp-de.h	Sun Aug  3 17:21:40 2008
@@ -18,7 +18,7 @@ static char help_text[]=
 "Basisoptionen: (siehe Manpage für eine vollständige Liste aller Optionen!)\n"
 " -vo <drv>        Wähle Videoausgabetreiber ('-vo help' für eine Liste)\n"
 " -ao <drv>        Wähle Audioausgabetreiber ('-ao help' für eine Liste)\n"
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
 " vcd://<tracknr>  Spiele einen (S)VCD-Titel (Super Video CD) ab\n"
 "                  ( direkter Gerätezugriff, kein mount! )\n"
 #endif

Modified: trunk/help/help_mp-dk.h
==============================================================================
--- trunk/help/help_mp-dk.h	(original)
+++ trunk/help/help_mp-dk.h	Sun Aug  3 17:21:40 2008
@@ -13,7 +13,7 @@ static char help_text[]=
 "Basale indstillinger (se manualen for en komplet liste):\n"
 " -vo <drv[:enhed]> vælg videodriver og enhed (detaljer, se '-vo help')\n"
 " -ao <drv[:enhed]> vælg lyddriver og enhed (detaljer, se '-ao help')\n"
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
 " vcd://<spor>  afspil et VCD (Video CD) spor fra et drev i stedet for en fil\n"
 #endif
 #ifdef CONFIG_DVDREAD

Modified: trunk/help/help_mp-el.h
==============================================================================
--- trunk/help/help_mp-el.h	(original)
+++ trunk/help/help_mp-el.h	Sun Aug  3 17:21:40 2008
@@ -11,7 +11,7 @@ static char help_text[]=
 "Βασικές επιλογές: (Ανατρέξτε στη  σελίδα εγχειριδίου για ολοκληρωμένη λίστα με επιλογές)\n"
 " -vo <drv[:dev]> επιλέξτε τον οδηγό εξόδου βίντεο και τη συσκευή (βλέπε '-vo help' για τη λίστα)\n"
 " -ao <drv[:dev]> επιλέξτε τον οδηγό εξόδου ήχου και τη συσκευή (βλέπε '-ao help' για τη λίστα)\n"
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
 " vcd://<αριθμός track>  αναπαραγωγή track VCD (video cd)  από συσκευή αντί για αρχείο\n"
 #endif
 #ifdef CONFIG_DVDREAD

Modified: trunk/help/help_mp-es.h
==============================================================================
--- trunk/help/help_mp-es.h	(original)
+++ trunk/help/help_mp-es.h	Sun Aug  3 17:21:40 2008
@@ -22,7 +22,7 @@ static char help_text[]=
 "Opciones básicas: ('man mplayer' para una lista completa)\n"
 " -vo <driver[:disp]>  Seleccionar driver de salida de video y dispositivo ('-vo help' para obtener una lista).\n"
 " -ao <driver[:disp]>  Seleccionar driver de salida de audio y dispositivo ('-ao help' para obtener una lista).\n"
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
 " vcd://<numpista>      Reproducir pista de (S)VCD (Super Video CD) (acceso directo al dispositivo, no montado)\n"
 #endif
 #ifdef CONFIG_DVDREAD

Modified: trunk/help/help_mp-fr.h
==============================================================================
--- trunk/help/help_mp-fr.h	(original)
+++ trunk/help/help_mp-fr.h	Sun Aug  3 17:21:40 2008
@@ -14,7 +14,7 @@ static char help_text[]=
 "Options de base :  (liste complète dans la page de man)\n"
 " -vo <pil[:pér]>  pilote et périph. vidéo de sortie ('-vo help' pour liste)\n"
 " -ao <pil[:pér]>  pilote et périph. audio de sortie ('-ao help' pour liste)\n"
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
 " vcd://<n°piste>  lit piste (S)VCD (Super Video CD) (périf. brut, non-monté)\n"
 #endif
 #ifdef CONFIG_DVDREAD

Modified: trunk/help/help_mp-hu.h
==============================================================================
--- trunk/help/help_mp-hu.h	(original)
+++ trunk/help/help_mp-hu.h	Sun Aug  3 17:21:40 2008
@@ -15,7 +15,7 @@ static char help_text[]=
 "Alapvető opciók: (az összes opció listájához lásd a man lapot)\n"
 " -vo <drv>        kimeneti videó meghajtó kiválasztása (lista: '-vo help')\n"
 " -ao <drv>        kimeneti audió meghajtó kiválasztása (lista: '-ao help')\n"
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
 " vcd://<sávszám>  (S)VCD (Super Video CD) sáv lejátszás (nyers, nincs mount)\n"
 #endif
 #ifdef CONFIG_DVDREAD

Modified: trunk/help/help_mp-it.h
==============================================================================
--- trunk/help/help_mp-it.h	(original)
+++ trunk/help/help_mp-it.h	Sun Aug  3 17:21:40 2008
@@ -13,7 +13,7 @@ static char help_text[]=
 "Opzioni di base: (vedi la pagina man per la lista completa)\n"
 " -vo <drv[:dev]>  sceglie driver di uscita video ('-vo help' lista)\n"
 " -ao <drv[:dev]>  sceglie driver di uscita audio ('-ao help' lista)\n"
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
 " vcd://<trackno>  legge (S)VCD (Super Video CD) (dispositivo raw, non montato)\n"
 #endif
 #ifdef CONFIG_DVDREAD

Modified: trunk/help/help_mp-ja.h
==============================================================================
--- trunk/help/help_mp-ja.h	(original)
+++ trunk/help/help_mp-ja.h	Sun Aug  3 17:21:40 2008
@@ -12,7 +12,7 @@ static char help_text[]=
 "基本的なオプション: (man page に全て網羅されています)\n"
 " -vo <drv[:dev]>  映像出力ドライバ及びデバイスを選択します ('-vo help'で一覧表示されます)\n"
 " -ao <drv[:dev]>  音声出力ドライバ及びデバイスを選択します ('-ao help'で一覧表示されます)\n"
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
 " vcd://<trackno>   play VCD (Video CD) track from device instead of plain file\n"
 #endif
 #ifdef CONFIG_DVDREAD

Modified: trunk/help/help_mp-ko.h
==============================================================================
--- trunk/help/help_mp-ko.h	(original)
+++ trunk/help/help_mp-ko.h	Sun Aug  3 17:21:40 2008
@@ -10,7 +10,7 @@ static char help_text[]=
 "기본 선택사항: (전체 목록은 man 페이지 참조)\n"
 " -vo <drv[:dev]>  비디오 출력 드라이버 및 장치 선택 (목록보기는 '-vo help')\n"
 " -ao <drv[:dev]>  오디오 출력 드라이버 및 장치 선택 (목록보기는 '-ao help')\n"
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
 " vcd://<trackno>  (S)VCD (Super Video CD) 트랙 재생 (장치로부터, 마운트 없이)\n"
 #endif
 #ifdef CONFIG_DVDREAD

Modified: trunk/help/help_mp-mk.h
==============================================================================
--- trunk/help/help_mp-mk.h	(original)
+++ trunk/help/help_mp-mk.h	Sun Aug  3 17:21:40 2008
@@ -11,7 +11,7 @@ static char help_text[]=
 "Основни Опции: (комплетна листа на man страницата)\n"
 " -vo <drv[:dev]>  избира излезен видео драјвер и уред ('-vo help' за листа)\n"
 " -ao <drv[:dev]>  избира излезен аудио драјвер и уред ('-ao help' за листа)\n"
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
 " vcd://<trackno>   пушта VCD (Video CD) од уред наместо од датотека\n"
 #endif
 #ifdef CONFIG_DVDREAD

Modified: trunk/help/help_mp-nl.h
==============================================================================
--- trunk/help/help_mp-nl.h	(original)
+++ trunk/help/help_mp-nl.h	Sun Aug  3 17:21:40 2008
@@ -9,7 +9,7 @@ static char help_text[]=
 "Basis-opties: (volledige lijst in de man-pagina's)\n"
 " -vo <drv[:dev]>  selecteer video uitvoer driver & device (zie '-vo help' voor lijst)\n"
 " -ao <drv[:dev]>  selecteer audio uitvoer driver & device (zie '-ao help' voor lijst)\n"
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
 " vcd://<trackno>   speel VCD (Video CD) track van cdrom in plaats van standaard bestand\n"
 #endif
 #ifdef CONFIG_DVDREAD

Modified: trunk/help/help_mp-pl.h
==============================================================================
--- trunk/help/help_mp-pl.h	(original)
+++ trunk/help/help_mp-pl.h	Sun Aug  3 17:21:40 2008
@@ -12,7 +12,7 @@ static char help_text[]=
 "Podstawowe opcje: (pełna lista dostępna na stronie man)\n"
 " -vo <drv>        podaj wyjściowy sterownik video (lista: '-vo help')\n"
 " -ao <drv>        podaj wyjściowy sterownik audio (lista: '-ao help')\n"
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
 " vcd://<numer_ścieżki>  odtwórz ścieżkę (S)VCD (Super Video CD) (bezpośrednio, bez montowania)\n"
 #endif
 #ifdef CONFIG_DVDREAD

Modified: trunk/help/help_mp-pt_BR.h
==============================================================================
--- trunk/help/help_mp-pt_BR.h	(original)
+++ trunk/help/help_mp-pt_BR.h	Sun Aug  3 17:21:40 2008
@@ -14,7 +14,7 @@ static char help_text[]=
 "                 ('-vo help' para listar)\n"
 " -ao <drv[:dev]> seleciona o driver de saída de audio & dispositivo\n"
 "                 ('-vo help' para listar)\n"
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
 " vcd://<numtrilha> reproduz trilha de VCD (Video CD) do dispositivo em vez de um\n"
 "                 arquivo\n"
 #endif

Modified: trunk/help/help_mp-ro.h
==============================================================================
--- trunk/help/help_mp-ro.h	(original)
+++ trunk/help/help_mp-ro.h	Sun Aug  3 17:21:40 2008
@@ -18,7 +18,7 @@ static char help_text[]=
 " -ao <drv[:dev]>  alege driver-ul ºi device-ul de ieºire audio\n"
 "                  ('-ao help' pentru listã)\n"
 
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
 " vcd://<nrpistã>  ruleazã pista VCD (Video CD) de pe device în loc de fiºier\n"
 #endif
 

Modified: trunk/help/help_mp-ru.h
==============================================================================
--- trunk/help/help_mp-ru.h	(original)
+++ trunk/help/help_mp-ru.h	Sun Aug  3 17:21:40 2008
@@ -13,7 +13,7 @@ static char help_text[]=
 "Базовые опции: (полный список см. на man-странице)\n"
 " -vo <drv[:dev]> выбор драйвера и устройства видеовывода (список см. с '-vo help')\n"
 " -ao <drv[:dev]> выбор драйвера и устройства аудиовывода (список см. с '-ao help')\n"
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
 " vcd://<номер трека> играть дорожку (S)VCD (Super Video CD) (указывайте устройство,\n                 не монтируйте его)\n"
 #endif
 #ifdef CONFIG_DVDREAD

Modified: trunk/help/help_mp-sk.h
==============================================================================
--- trunk/help/help_mp-sk.h	(original)
+++ trunk/help/help_mp-sk.h	Sun Aug  3 17:21:40 2008
@@ -13,7 +13,7 @@ static char help_text[]=
 "Základné prepínače: (Kompletný zoznam nájdete v man stránke)\n"
 " -vo <drv[:dev]> výber výstup. video ovládača&zariadenia (-vo help pre zoznam)\n"
 " -ao <drv[:dev]> výber výstup. audio ovládača&zariadenia (-ao help pre zoznam)\n"
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
 " vcd://<trackno>  prehrať VCD (video cd) stopu zo zariadenia namiesto zo súboru\n"
 #endif
 #ifdef CONFIG_DVDREAD

Modified: trunk/help/help_mp-sv.h
==============================================================================
--- trunk/help/help_mp-sv.h	(original)
+++ trunk/help/help_mp-sv.h	Sun Aug  3 17:21:40 2008
@@ -10,7 +10,7 @@ static char help_text[]=
 "Grundläggande argument: (komplett lista återfinns i `man mplayer`)\n"
 " -vo <drv[:enhet]>   välj video-ut drivrutin & enhet ('-vo help' för lista)\n"
 " -ao <drv[:enhet]>   välj audio-ut drivrutin & enhet ('-ao help' för lista)\n"
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
 " vcd://<spårnr>      spela (S)VCD (Super Video CD) spår (rå enhet, ingen montering)\n"
 #endif
 #ifdef CONFIG_DVDREAD

Modified: trunk/help/help_mp-tr.h
==============================================================================
--- trunk/help/help_mp-tr.h	(original)
+++ trunk/help/help_mp-tr.h	Sun Aug  3 17:21:40 2008
@@ -13,7 +13,7 @@ static char help_text[]=
 "Genel seçenekler: (Tüm seçenekler için man sayfalarına bakınız)\n"
 " -vo <sürücü>          video çıkış sürücüsünü seçer ('-vo help' ile listeyi görebilirsiniz)\n"
 " -ao <sürücü>          ses çıkış sürücüsü seçer ('-ao help' ile listeyi görebilirsiniz)\n"
-#ifdef HAVE_VCD
+#ifdef CONFIG_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 CONFIG_DVDREAD

Modified: trunk/help/help_mp-uk.h
==============================================================================
--- trunk/help/help_mp-uk.h	(original)
+++ trunk/help/help_mp-uk.h	Sun Aug  3 17:21:40 2008
@@ -10,7 +10,7 @@ static char help_text[]=
 "Опції:\n"
 " -vo <drv[:dev]> вибір драйвера і пристрою відео виводу (список див. з '-vo help')\n"
 " -ao <drv[:dev]> вибір драйвера і пристрою аудіо виводу (список див. з '-ao help')\n"
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
 " vcd://<номер треку> грати VCD (video cd) трек з пристрою замість файлу\n"
 #endif
 #ifdef CONFIG_DVDREAD

Modified: trunk/help/help_mp-zh_CN.h
==============================================================================
--- trunk/help/help_mp-zh_CN.h	(original)
+++ trunk/help/help_mp-zh_CN.h	Sun Aug  3 17:21:40 2008
@@ -23,7 +23,7 @@ static char help_text[]=
 "基本选项：        （完整列表参见手册页）\n"
 " -vo <drv>        选择视频输出驱动程序（查看驱动程序列表用“-vo help”）\n"
 " -ao <drv>        选择音频输出驱动程序（查看驱动程序列表用“-ao help”）\n"
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
 " vcd://<曲目号>   播放 (S)VCD（超级VCD）曲目（无格式设备，无需装载）\n"
 #endif
 #ifdef CONFIG_DVDREAD

Modified: trunk/help/help_mp-zh_TW.h
==============================================================================
--- trunk/help/help_mp-zh_TW.h	(original)
+++ trunk/help/help_mp-zh_TW.h	Sun Aug  3 17:21:40 2008
@@ -15,7 +15,7 @@ static char help_text[]=
 "基本選項: (完整列表參見手册頁)\n"
 " -vo <drv>        選擇視頻輸出驅動 (查看驅動列表用“-vo help”)\n"
 " -ao <drv>        選擇音頻輸出驅動 (查看驅動列表用“-ao help”)\n"
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
 " vcd://<trackno>  播放 (S)VCD 軌迹號 (原始設備, 無需安挂)\n"
 #endif
 #ifdef CONFIG_DVDREAD

