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

5 files changed, 17 insertions, 17 deletions

diff --git a/stream/audio_in.c b/stream/audio_in.c
index 2a988ef84f..45b1e9b79d 100644
--- a/stream/audio_in.c
+++ b/stream/audio_in.c
@@ -23,7 +23,7 @@ int audio_in_init(audio_in_t *ai, int type)
     ai->samplesize = -1;
 
     switch (ai->type) {
-#if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X)
+#ifdef CONFIG_ALSA
     case AUDIO_IN_ALSA:
 	ai->alsa.handle = NULL;
 	ai->alsa.log = NULL;
@@ -45,7 +45,7 @@ int audio_in_setup(audio_in_t *ai)
 {
     
     switch (ai->type) {
-#if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X)
+#ifdef CONFIG_ALSA
     case AUDIO_IN_ALSA:
 	if (ai_alsa_init(ai) < 0) return -1;
 	ai->setup = 1;
@@ -65,7 +65,7 @@ int audio_in_setup(audio_in_t *ai)
 int audio_in_set_samplerate(audio_in_t *ai, int rate)
 {
     switch (ai->type) {
-#if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X)
+#ifdef CONFIG_ALSA
     case AUDIO_IN_ALSA:
 	ai->req_samplerate = rate;
 	if (!ai->setup) return 0;
@@ -87,7 +87,7 @@ int audio_in_set_samplerate(audio_in_t *ai, int rate)
 int audio_in_set_channels(audio_in_t *ai, int channels)
 {
     switch (ai->type) {
-#if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X)
+#ifdef CONFIG_ALSA
     case AUDIO_IN_ALSA:
 	ai->req_channels = channels;
 	if (!ai->setup) return 0;
@@ -108,12 +108,12 @@ int audio_in_set_channels(audio_in_t *ai, int channels)
 
 int audio_in_set_device(audio_in_t *ai, char *device)
 {
-#if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X)
+#ifdef CONFIG_ALSA
     int i;
 #endif
     if (ai->setup) return -1;
     switch (ai->type) {
-#if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X)
+#ifdef CONFIG_ALSA
     case AUDIO_IN_ALSA:
 	if (ai->alsa.device) free(ai->alsa.device);
 	ai->alsa.device = strdup(device);
@@ -138,7 +138,7 @@ int audio_in_uninit(audio_in_t *ai)
 {
     if (ai->setup) {
 	switch (ai->type) {
-#if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X)
+#ifdef CONFIG_ALSA
 	case AUDIO_IN_ALSA:
 	    if (ai->alsa.log)
 		snd_output_close(ai->alsa.log);
@@ -162,7 +162,7 @@ int audio_in_uninit(audio_in_t *ai)
 int audio_in_start_capture(audio_in_t *ai)
 {
     switch (ai->type) {
-#if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X)
+#ifdef CONFIG_ALSA
     case AUDIO_IN_ALSA:
 	return snd_pcm_start(ai->alsa.handle);
 #endif
@@ -180,7 +180,7 @@ int audio_in_read_chunk(audio_in_t *ai, unsigned char *buffer)
     int ret;
     
     switch (ai->type) {
-#if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X)
+#ifdef CONFIG_ALSA
     case AUDIO_IN_ALSA:
 	ret = snd_pcm_readi(ai->alsa.handle, buffer, ai->alsa.chunk_size);
 	if (ret != ai->alsa.chunk_size) {
diff --git a/stream/audio_in.h b/stream/audio_in.h
index ee22571234..855d613964 100644
--- a/stream/audio_in.h
+++ b/stream/audio_in.h
@@ -6,7 +6,7 @@
 
 #include "config.h"
 
-#if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X)
+#ifdef CONFIG_ALSA
 #include <alsa/asoundlib.h>
 
 typedef struct {
@@ -43,7 +43,7 @@ typedef struct
     int bytes_per_sample;
     int samplesize;
     
-#if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X)
+#ifdef CONFIG_ALSA
     ai_alsa_t alsa;
 #endif
 #ifdef CONFIG_OSS_AUDIO
@@ -60,7 +60,7 @@ int audio_in_uninit(audio_in_t *ai);
 int audio_in_start_capture(audio_in_t *ai);
 int audio_in_read_chunk(audio_in_t *ai, unsigned char *buffer);
 
-#if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X)
+#ifdef CONFIG_ALSA
 int ai_alsa_setup(audio_in_t *ai);
 int ai_alsa_init(audio_in_t *ai);
 int ai_alsa_xrun(audio_in_t *ai);
diff --git a/stream/stream_radio.c b/stream/stream_radio.c
index 3002ee38c7..9792fb142c 100644
--- a/stream/stream_radio.c
+++ b/stream/stream_radio.c
@@ -715,7 +715,7 @@ static int read_chunk(audio_in_t *ai, unsigned char *buffer)
     int ret;
 
     switch (ai->type) {
-#if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X)
+#ifdef CONFIG_ALSA
     case AUDIO_IN_ALSA:
         //device opened in non-blocking mode
         ret = snd_pcm_readi(ai->alsa.handle, buffer, ai->alsa.chunk_size);
@@ -836,7 +836,7 @@ static int init_audio(radio_priv_t *priv)
 
     priv->do_capture=1;
     mp_msg(MSGT_RADIO,MSGL_V,MSGTR_RADIO_CaptureStarting);
-#if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X)
+#ifdef CONFIG_ALSA
     while ((tmp = strrchr(priv->radio_param->adevice, '='))){
         tmp[0] = ':';
         //adevice option looks like ALSA device name. Switching to ALSA
@@ -862,7 +862,7 @@ static int init_audio(radio_priv_t *priv)
     if(is_oss)
         ioctl(priv->audio_in.oss.audio_fd, SNDCTL_DSP_NONBLOCK, 0);
 #endif
-#if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X)
+#ifdef CONFIG_ALSA
     if(!is_oss)
         snd_pcm_nonblock(priv->audio_in.alsa.handle,1);
 #endif
diff --git a/stream/tvi_v4l.c b/stream/tvi_v4l.c
index b5c647241c..8979691776 100644
--- a/stream/tvi_v4l.c
+++ b/stream/tvi_v4l.c
@@ -627,7 +627,7 @@ static int init(priv_t *priv)
     /* audio init */
     if (!priv->tv_param->noaudio) {
 
-#if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X)
+#ifdef CONFIG_ALSA
         if (priv->tv_param->alsa)
             audio_in_init(&priv->audio_in, AUDIO_IN_ALSA);
         else
diff --git a/stream/tvi_v4l2.c b/stream/tvi_v4l2.c
index 4a273a1b35..fc23727f9f 100644
--- a/stream/tvi_v4l2.c
+++ b/stream/tvi_v4l2.c
@@ -378,7 +378,7 @@ static void init_audio(priv_t *priv)
     if (priv->audio_initialized) return;
 
     if (!priv->tv_param->noaudio) {
-#if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X)
+#ifdef CONFIG_ALSA
         if (priv->tv_param->alsa)
             audio_in_init(&priv->audio_in, AUDIO_IN_ALSA);
         else