Change a bunch of video/audio-output-specific preprocessor directives from

a HAVE_ prefix to a CONFIG_ prefix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27402 b3059339-0415-0410-9bf9-f77b7e298cf2

8 files changed, 33 insertions, 33 deletions

diff --git a/gui/cfg.c b/gui/cfg.c
index 3131254edc..33fdb5c952 100644
--- a/gui/cfg.c
+++ b/gui/cfg.c
@@ -63,7 +63,7 @@ char * gtkAOALSAMixer;
 char * gtkAOALSAMixerChannel;
 char * gtkAOALSADevice;
 #endif
-#ifdef HAVE_SDL
+#ifdef CONFIG_SDL
 char * gtkAOSDLDriver;
 #endif
 #ifdef CONFIG_ESD
@@ -76,7 +76,7 @@ int    gtkCacheSize = 2048;
 int    gtkAutoSyncOn = 0;
 int    gtkAutoSync = 0;
 
-#ifdef HAVE_DXR3
+#ifdef CONFIG_DXR3
  char * gtkDXR3Device;
 #endif
 
@@ -111,7 +111,7 @@ static const m_option_t gui_opts[] =
  { "vo_panscan",&vo_panscan,CONF_TYPE_FLOAT,CONF_RANGE,0.0,1.0,NULL },
  { "vo_doublebuffering",&vo_doublebuffering,CONF_TYPE_FLAG,0,0,1,NULL },
  { "vo_direct_render",&vo_directrendering,CONF_TYPE_FLAG,0,0,1,NULL },
-#ifdef HAVE_DXR3
+#ifdef CONFIG_DXR3
  { "vo_dxr3_device",&gtkDXR3Device,CONF_TYPE_STRING,0,0,0,NULL },
 #endif
 
@@ -144,7 +144,7 @@ static const m_option_t gui_opts[] =
  { "ao_alsa_mixer_channel",&gtkAOALSAMixerChannel,CONF_TYPE_STRING,0,0,0,NULL },
  { "ao_alsa_device",&gtkAOALSADevice,CONF_TYPE_STRING,0,0,0,NULL },
 #endif
-#ifdef HAVE_SDL
+#ifdef CONFIG_SDL
  { "ao_sdl_subdriver",&gtkAOSDLDriver,CONF_TYPE_STRING,0,0,0,NULL },
 #endif
 #ifdef CONFIG_ESD
diff --git a/gui/interface.c b/gui/interface.c
index a0e5ae72c5..c60f5321b0 100644
--- a/gui/interface.c
+++ b/gui/interface.c
@@ -185,7 +185,7 @@ void guiInit( void )
  guiIntfStruct.StreamType=-1;
 
  memset( &gtkEquChannels,0,sizeof( gtkEquChannels ) );
-#ifdef HAVE_DXR3
+#ifdef CONFIG_DXR3
  if ( !gtkDXR3Device ) gtkDXR3Device=strdup( "/dev/em8300-0" );
 #endif
  if ( stream_cache_size > 0 ) { gtkCacheOn=1; gtkCacheSize=stream_cache_size; }
@@ -616,7 +616,7 @@ int guiGetEvent( int type,char * arg )
 	       guiGetEvent( guiSetDVD,(char *)stream->priv );
 	       break;
 #endif
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
 	  case STREAMTYPE_VCD: 
 	       {
 	        int i;
@@ -706,7 +706,7 @@ int guiGetEvent( int type,char * arg )
 	     }
 	 }
 // -- subtitle
-#ifdef HAVE_DXR3
+#ifdef CONFIG_DXR3
 	if ( video_driver_list && !gstrcmp( video_driver_list[0],"dxr3" ) && guiIntfStruct.FileFormat != DEMUXER_TYPE_MPEG_PS
 #ifdef CONFIG_LIBAVCODEC
 	 && !gtkVfLAVC
@@ -743,7 +743,7 @@ int guiGetEvent( int type,char * arg )
          {
 	  case STREAMTYPE_PLAYLIST:
 	       break;
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
 	  case STREAMTYPE_VCD:
 	       {
 	        char tmp[512];
@@ -795,7 +795,7 @@ int guiGetEvent( int type,char * arg )
 	   }
 	}
 
-#ifdef HAVE_DXR3
+#ifdef CONFIG_DXR3
 #ifdef CONFIG_LIBAVCODEC
 	remove_vf( "lavc" );
 #endif
@@ -857,7 +857,7 @@ int guiGetEvent( int type,char * arg )
 	  free(tmp);
 	 }
 #endif
-#ifdef HAVE_SDL
+#ifdef CONFIG_SDL
 	if ( audio_driver_list && !gstrncmp( audio_driver_list[0],"sdl",3 ) )
 	 {
 	  char *tmp;
@@ -1125,7 +1125,7 @@ void * gtkSet( int cmd,float fparam, void * vparam )
 #ifdef CONFIG_DVDREAD
 	if ( (unsigned int)vparam & guiDVD ) memset( &guiIntfStruct.DVD,0,sizeof( guiDVDStruct ) );
 #endif
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
 	if ( (unsigned int)vparam & guiVCD ) guiIntfStruct.VCDTracks=0;
 #endif
 	return NULL;
diff --git a/gui/interface.h b/gui/interface.h
index 372c888d15..a739d2c640 100644
--- a/gui/interface.h
+++ b/gui/interface.h
@@ -90,7 +90,7 @@ typedef struct
    int			Chapter;
 #endif
 
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
    int    VCDTracks;
 #endif
 
diff --git a/gui/mplayer/gtk/menu.c b/gui/mplayer/gtk/menu.c
index d54d4fe1e3..beac3325c1 100644
--- a/gui/mplayer/gtk/menu.c
+++ b/gui/mplayer/gtk/menu.c
@@ -72,7 +72,7 @@
 #include "../pixmaps/tonguebla.xpm"
 #include "../pixmaps/empty1px.xpm"
 #endif
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
 #include "../pixmaps/vcd.xpm"
 #include "../pixmaps/playvcd.xpm"
 #endif
@@ -421,7 +421,7 @@ GtkWidget * create_PopUpMenu( void )
   AddSeparator( Menu );
    SubMenu=AddSubMenu( window1, (const char*)open_xpm, Menu,MSGTR_MENU_Open );
     AddMenuItem( window1, (const char*)file2_xpm, SubMenu,MSGTR_MENU_PlayFile"    ", evLoadPlay );
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
     AddMenuItem( window1, (const char*)playvcd_xpm, SubMenu,MSGTR_MENU_PlayVCD, evPlayVCD );
 #endif
 #ifdef CONFIG_DVDREAD
@@ -446,7 +446,7 @@ GtkWidget * create_PopUpMenu( void )
 //    AddMenuItem( SubMenu,MSGTR_MENU_NormalSize"      ", evNormalSize );
 //    AddMenuItem( SubMenu,MSGTR_MENU_DoubleSize, evDoubleSize );
 //    AddMenuItem( SubMenu,MSGTR_MENU_FullScreen, evFullScreen );
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
    VCDSubMenu=AddSubMenu( window1, (const char*)vcd_xpm, Menu,MSGTR_MENU_VCD );
     AddMenuItem( window1, (const char*)playvcd_xpm, VCDSubMenu,MSGTR_MENU_PlayDisc,evPlayVCD );
     AddSeparator( VCDSubMenu );
diff --git a/gui/mplayer/gtk/opts.c b/gui/mplayer/gtk/opts.c
index 281f49de71..027f931238 100644
--- a/gui/mplayer/gtk/opts.c
+++ b/gui/mplayer/gtk/opts.c
@@ -178,7 +178,7 @@ static char * ao_driver[3];
 static char * vo_driver[3];
 static int    old_video_driver = 0;
 
-#ifdef HAVE_DXR3
+#ifdef CONFIG_DXR3
  void ShowDXR3Config( void );
  void HideDXR3Config( void );
 #endif
@@ -271,7 +271,7 @@ void ShowPreferences( void )
   gtk_clist_select_row( GTK_CLIST( CLVDrivers ),old_video_driver,0 );
   gtk_clist_get_text( GTK_CLIST( CLVDrivers ),old_video_driver,0,(char **)&vo_driver );
   gtk_widget_set_sensitive( VConfig,FALSE );
-#ifdef HAVE_DXR3
+#ifdef CONFIG_DXR3
   if ( !gstrcmp( vo_driver[0],"dxr3" ) ) gtk_widget_set_sensitive( VConfig,TRUE );
 #endif
  }
@@ -487,7 +487,7 @@ void HidePreferences( void )
  gtk_widget_destroy( Preferences );
  Preferences=NULL;
  HideAudioConfig();
-#ifdef HAVE_DXR3
+#ifdef CONFIG_DXR3
  HideDXR3Config();
 #endif
 }
@@ -649,7 +649,7 @@ void prButton( GtkButton * button,gpointer user_data )
    case bVconfig:
 	if ( !vo_driver[0] ) break;
         gtk_widget_set_sensitive( VConfig,FALSE );
-#ifdef HAVE_DXR3
+#ifdef CONFIG_DXR3
 	if ( !gstrcmp( vo_driver[0],"dxr3" ) ) { ShowDXR3Config(); gtk_widget_set_sensitive( VConfig,TRUE ); }
 #endif
 	break;
@@ -790,7 +790,7 @@ static void prCListRow( GtkCList * clist,gint row,gint column,GdkEvent * event,g
    case 1: // video driver 
 	gtk_clist_get_text( GTK_CLIST( CLVDrivers ),row,0,(char **)&vo_driver ); 
 	gtk_widget_set_sensitive( VConfig,FALSE );
-#ifdef HAVE_DXR3
+#ifdef CONFIG_DXR3
 	if ( !gstrcmp( vo_driver[0],"dxr3" ) ) gtk_widget_set_sensitive( VConfig,TRUE );
 #endif
 	break;
@@ -1388,7 +1388,7 @@ GList *appendOSSDevices(GList *l) {
     l = g_list_append(l, (gpointer)"/dev/dsp2");
     l = g_list_append(l, (gpointer)"/dev/dsp3");
   }
-#ifdef HAVE_DXR3
+#ifdef CONFIG_DXR3
   l = g_list_append(l, (gpointer)"/dev/em8300_ma");
   l = g_list_append(l, (gpointer)"/dev/em8300_ma-0");
   l = g_list_append(l, (gpointer)"/dev/em8300_ma-1");
@@ -1450,7 +1450,7 @@ GList *appendALSAMixerChannels(GList *l) {
 }
 #endif
 
-#ifdef HAVE_SDL
+#ifdef CONFIG_SDL
 GList *appendSDLDevices(GList *l) {
   l = g_list_append(l, (gpointer)"alsa");
   l = g_list_append(l, (gpointer)"arts");
@@ -1517,7 +1517,7 @@ void ShowAudioConfig() {
     setGtkEntryText(CEAudioMixerChannel, gtkAOALSAMixerChannel);
   }
 #endif
-#ifdef HAVE_SDL
+#ifdef CONFIG_SDL
   if (strncmp(ao_driver[0], "sdl", 3) == 0) {
     setGtkEntryText(CEAudioDevice, gtkAOSDLDriver);
   }
@@ -1562,7 +1562,7 @@ static void audioButton(GtkButton *button, gpointer user_data) {
         gtkAOALSAMixerChannel = gstrdup(getGtkEntryText(CEAudioMixerChannel));
       }
 #endif
-#ifdef HAVE_SDL
+#ifdef CONFIG_SDL
       if (strncmp(ao_driver[0], "sdl", 3) == 0) {
         gfree(&gtkAOSDLDriver);
         gtkAOSDLDriver = gstrdup(getGtkEntryText(CEAudioDevice));
@@ -1620,7 +1620,7 @@ GtkWidget *create_AudioConfig() {
   if (strncmp(ao_driver[0], "alsa", 4) == 0)
     items = appendALSADevices(items);
 #endif
-#ifdef HAVE_SDL
+#ifdef CONFIG_SDL
   if (strncmp(ao_driver[0], "sdl", 3) == 0)
     items = appendSDLDevices(items);
 #endif
@@ -1700,7 +1700,7 @@ GtkWidget *create_AudioConfig() {
   return AudioConfig;
 }
 
-#ifdef HAVE_DXR3
+#ifdef CONFIG_DXR3
 // --- dxr3 config box
 
 static GtkWidget * DXR3Config;
diff --git a/gui/mplayer/gui_common.c b/gui/mplayer/gui_common.c
index b422fc4a0b..957e85d3b1 100644
--- a/gui/mplayer/gui_common.c
+++ b/gui/mplayer/gui_common.c
@@ -77,7 +77,7 @@ static inline void TranslateFilename( int c,char * tmp,size_t tmplen )
             else av_strlcat( tmp,MSGTR_NoChapter,tmplen );
           break;
 #endif
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
    case STREAMTYPE_VCD:
         snprintf( tmp,tmplen,MSGTR_VCDTrack,guiIntfStruct.Track );
 	break;
@@ -174,7 +174,7 @@ calclengthmmmmss:
            switch ( guiIntfStruct.StreamType )
             {
              case STREAMTYPE_FILE:   av_strlcat( trbuf,"f",sizeof( trbuf ) ); break;
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
              case STREAMTYPE_VCD:    av_strlcat( trbuf,"v",sizeof( trbuf ) ); break;
 #endif
              case STREAMTYPE_STREAM: av_strlcat( trbuf,"u",sizeof( trbuf ) ); break;
diff --git a/gui/mplayer/mw.c b/gui/mplayer/mw.c
index d6d269eb52..6f8866c640 100644
--- a/gui/mplayer/mw.c
+++ b/gui/mplayer/mw.c
@@ -128,7 +128,7 @@ void mplEventHandling( int msg,float param )
         mp_property_do("sub",M_PROPERTY_SET,&iparam,guiIntfStruct.mpcontext); 
 	break;
 
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
    case evSetVCDTrack:
         guiIntfStruct.Track=iparam;
    case evPlayVCD:
@@ -165,7 +165,7 @@ play:
 	  case STREAMTYPE_FILE:
 	       gtkSet( gtkClearStruct,0,(void *)(guiALL - guiFilenames) );
 	       break;
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
           case STREAMTYPE_VCD:
 	       gtkSet( gtkClearStruct,0,(void *)(guiALL - guiVCD - guiFilenames) );
 	       if ( !cdrom_device ) cdrom_device=gstrdup( DEFAULT_CDROM_DEVICE );
diff --git a/gui/mplayer/play.c b/gui/mplayer/play.c
index a06370c2b8..63b639d5d1 100644
--- a/gui/mplayer/play.c
+++ b/gui/mplayer/play.c
@@ -296,7 +296,7 @@ void mplCurr( void )
    case STREAMTYPE_DVD:
 	break;
 #endif
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
    case STREAMTYPE_VCD:
 	break;
 #endif
@@ -332,7 +332,7 @@ void mplPrev( void )
 	guiIntfStruct.Track=guiIntfStruct.DVD.current_title;
 	break;
 #endif
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
    case STREAMTYPE_VCD:
 	if ( --guiIntfStruct.Track == 0 ) { guiIntfStruct.Track=1; stop=1; }
 	break;
@@ -368,7 +368,7 @@ void mplNext( void )
 	guiIntfStruct.Track=guiIntfStruct.DVD.current_title;
 	break;
 #endif
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
    case STREAMTYPE_VCD:
 	if ( ++guiIntfStruct.Track > guiIntfStruct.VCDTracks ) { guiIntfStruct.Track=guiIntfStruct.VCDTracks; stop=1; }
 	break;