diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-08-06 23:19:29 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-08-06 23:19:29 +0000 |
commit | 024b6efdf1439c2573350048a433d0324dcee349 (patch) | |
tree | 1b6f2ddfb80e8caaed1338601dc0036d06347070 /gui | |
parent | 64877d97ad5d2803a385f628bcc4033932e8e5b5 (diff) | |
download | mpv-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')
-rw-r--r-- | gui/cfg.c | 4 | ||||
-rw-r--r-- | gui/interface.c | 2 | ||||
-rw-r--r-- | gui/mplayer/gtk/opts.c | 12 |
3 files changed, 9 insertions, 9 deletions
@@ -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",>kAOOSSMixerChannel,CONF_TYPE_STRING,0,0,0,NULL }, { "ao_oss_device",>kAOOSSDevice,CONF_TYPE_STRING,0,0,0,NULL }, #endif -#if defined(CONFIG_ALSA9) || defined (CONFIG_ALSA1X) +#ifdef CONFIG_ALSA { "ao_alsa_mixer",>kAOALSAMixer,CONF_TYPE_STRING,0,0,0,NULL }, { "ao_alsa_mixer_channel",>kAOALSAMixerChannel,CONF_TYPE_STRING,0,0,0,NULL }, { "ao_alsa_device",>kAOALSADevice,CONF_TYPE_STRING,0,0,0,NULL }, diff --git a/gui/interface.c b/gui/interface.c index 3b0cd78066..d33810a53d 100644 --- a/gui/interface.c +++ b/gui/interface.c @@ -842,7 +842,7 @@ int guiGetEvent( int type,char * arg ) free(tmp); } #endif -#if defined(CONFIG_ALSA9) || defined (CONFIG_ALSA1X) +#ifdef CONFIG_ALSA 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 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(>kAOALSADevice); 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 |