Introduce CONFIG_ALSA preprocessor directive for ALSA 0.9 and 1.x.

Use it in all the places that checked for either ALSA 0.9 or 1.x.


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

1 files changed, 2 insertions, 2 deletions

diff --git a/gui/cfg.c b/gui/cfg.c
index 846de7620e..589c6277f0 100644
--- a/gui/cfg.c
+++ b/gui/cfg.c
@@ -58,7 +58,7 @@ char * gtkAOOSSMixer;
 char * gtkAOOSSMixerChannel;
 char * gtkAOOSSDevice;
 #endif
-#if defined(CONFIG_ALSA9) || defined (CONFIG_ALSA1X)
+#ifdef CONFIG_ALSA
 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(CONFIG_ALSA9) || defined (CONFIG_ALSA1X)
+#ifdef CONFIG_ALSA
  { "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 },