summaryrefslogtreecommitdiffstats
path: root/gui/mplayer
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-08-06 23:19:29 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-08-06 23:19:29 +0000
commit024b6efdf1439c2573350048a433d0324dcee349 (patch)
tree1b6f2ddfb80e8caaed1338601dc0036d06347070 /gui/mplayer
parent64877d97ad5d2803a385f628bcc4033932e8e5b5 (diff)
downloadmpv-024b6efdf1439c2573350048a433d0324dcee349.tar.bz2
mpv-024b6efdf1439c2573350048a433d0324dcee349.tar.xz
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
Diffstat (limited to 'gui/mplayer')
-rw-r--r--gui/mplayer/gtk/opts.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/gui/mplayer/gtk/opts.c b/gui/mplayer/gtk/opts.c
index 700050ae0d..a5b4f762c2 100644
--- a/gui/mplayer/gtk/opts.c
+++ b/gui/mplayer/gtk/opts.c
@@ -1423,7 +1423,7 @@ GList *appendOSSMixerChannels(GList *l) {
}
#endif
-#if defined(CONFIG_ALSA9) || defined (CONFIG_ALSA1X)
+#ifdef CONFIG_ALSA
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(CONFIG_ALSA9) || defined (CONFIG_ALSA1X)
+#ifdef CONFIG_ALSA
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(CONFIG_ALSA9) || defined (CONFIG_ALSA1X)
+#ifdef CONFIG_ALSA
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(CONFIG_ALSA9) || defined (CONFIG_ALSA1X)
+#ifdef CONFIG_ALSA
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(CONFIG_ALSA9) || defined (CONFIG_ALSA1X)
+#ifdef CONFIG_ALSA
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(CONFIG_ALSA9) || defined (CONFIG_ALSA1X)
+#ifdef CONFIG_ALSA
if (strncmp(ao_driver[0], "alsa", 4) == 0)
items = appendALSAMixerChannels(items);
#endif