From f83e779ee4c356947770069f6ccc993d23e981e3 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Tue, 5 Aug 2008 16:32:47 +0000
Subject: Rename some audio-output-related preprocessor directives. Switch them
 from a HAVE_ prefix to a CONFIG_ prefix.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27419 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 gui/cfg.c              |  4 ++--
 gui/interface.c        |  2 +-
 gui/mplayer/gtk/opts.c | 12 ++++++------
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'gui')

diff --git a/gui/cfg.c b/gui/cfg.c
index 33fdb5c952..846de7620e 100644
--- a/gui/cfg.c
+++ b/gui/cfg.c
@@ -58,7 +58,7 @@ char * gtkAOOSSMixer;
 char * gtkAOOSSMixerChannel;
 char * gtkAOOSSDevice;
 #endif
-#if defined(HAVE_ALSA9) || defined (HAVE_ALSA1X)
+#if defined(CONFIG_ALSA9) || defined (CONFIG_ALSA1X)
 char * gtkAOALSAMixer;
 char * gtkAOALSAMixerChannel;
 char * gtkAOALSADevice;
@@ -139,7 +139,7 @@ static const m_option_t gui_opts[] =
  { "ao_oss_mixer_channel",&gtkAOOSSMixerChannel,CONF_TYPE_STRING,0,0,0,NULL },
  { "ao_oss_device",&gtkAOOSSDevice,CONF_TYPE_STRING,0,0,0,NULL },
 #endif
-#if defined(HAVE_ALSA9) || defined (HAVE_ALSA1X)
+#if defined(CONFIG_ALSA9) || defined (CONFIG_ALSA1X)
  { "ao_alsa_mixer",&gtkAOALSAMixer,CONF_TYPE_STRING,0,0,0,NULL },
  { "ao_alsa_mixer_channel",&gtkAOALSAMixerChannel,CONF_TYPE_STRING,0,0,0,NULL },
  { "ao_alsa_device",&gtkAOALSADevice,CONF_TYPE_STRING,0,0,0,NULL },
diff --git a/gui/interface.c b/gui/interface.c
index c60f5321b0..3b0cd78066 100644
--- a/gui/interface.c
+++ b/gui/interface.c
@@ -842,7 +842,7 @@ int guiGetEvent( int type,char * arg )
 	  free(tmp);
 	 }
 #endif
-#if defined(HAVE_ALSA9) || defined (HAVE_ALSA1X)
+#if defined(CONFIG_ALSA9) || defined (CONFIG_ALSA1X)
 	if ( audio_driver_list && !gstrncmp( audio_driver_list[0],"alsa",4 ) )
 	 {
 	  char *tmp;
diff --git a/gui/mplayer/gtk/opts.c b/gui/mplayer/gtk/opts.c
index 027f931238..700050ae0d 100644
--- a/gui/mplayer/gtk/opts.c
+++ b/gui/mplayer/gtk/opts.c
@@ -1423,7 +1423,7 @@ GList *appendOSSMixerChannels(GList *l) {
 }
 #endif
 
-#if defined(HAVE_ALSA9) || defined (HAVE_ALSA1X)
+#if defined(CONFIG_ALSA9) || defined (CONFIG_ALSA1X)
 GList *appendALSADevices(GList *l) {
   l = g_list_append(l, (gpointer)"default");
   l = g_list_append(l, (gpointer)"hw=0.0");
@@ -1510,7 +1510,7 @@ void ShowAudioConfig() {
     setGtkEntryText(CEAudioMixerChannel, gtkAOOSSMixerChannel);
   }
 #endif
-#if defined(HAVE_ALSA9) || defined (HAVE_ALSA1X)
+#if defined(CONFIG_ALSA9) || defined (CONFIG_ALSA1X)
   if (strncmp(ao_driver[0], "alsa", 4) == 0) {
     setGtkEntryText(CEAudioDevice, gtkAOALSADevice);
     setGtkEntryText(CEAudioMixer, gtkAOALSAMixer);
@@ -1552,7 +1552,7 @@ static void audioButton(GtkButton *button, gpointer user_data) {
         gtkAOOSSMixerChannel = gstrdup(getGtkEntryText(CEAudioMixerChannel));
       }
 #endif
-#if defined(HAVE_ALSA9) || defined (HAVE_ALSA1X)
+#if defined(CONFIG_ALSA9) || defined (CONFIG_ALSA1X)
       if (strncmp(ao_driver[0], "alsa", 4) == 0) {
         gfree(&gtkAOALSADevice);
         gtkAOALSADevice = gstrdup(getGtkEntryText(CEAudioDevice));
@@ -1616,7 +1616,7 @@ GtkWidget *create_AudioConfig() {
   if (strncmp(ao_driver[0], "oss", 3) == 0)
     items = appendOSSDevices(items);
 #endif
-#if defined(HAVE_ALSA9) || defined (HAVE_ALSA1X)
+#if defined(CONFIG_ALSA9) || defined (CONFIG_ALSA1X)
   if (strncmp(ao_driver[0], "alsa", 4) == 0)
     items = appendALSADevices(items);
 #endif
@@ -1646,7 +1646,7 @@ GtkWidget *create_AudioConfig() {
   if (strncmp(ao_driver[0], "oss", 3) == 0)
     items = appendOSSMixers(items);
 #endif
-#if defined(HAVE_ALSA9) || defined (HAVE_ALSA1X)
+#if defined(CONFIG_ALSA9) || defined (CONFIG_ALSA1X)
   if (strncmp(ao_driver[0], "alsa", 4) == 0)
     items = appendALSAMixers(items);
 #endif
@@ -1668,7 +1668,7 @@ GtkWidget *create_AudioConfig() {
   if (strncmp(ao_driver[0], "oss", 3) == 0)
     items = appendOSSMixerChannels(items);
 #endif
-#if defined(HAVE_ALSA9) || defined (HAVE_ALSA1X)
+#if defined(CONFIG_ALSA9) || defined (CONFIG_ALSA1X)
   if (strncmp(ao_driver[0], "alsa", 4) == 0)
     items = appendALSAMixerChannels(items);
 #endif
-- 
cgit v1.2.3