From 02135001b44afc5446228228055c9ce7f29df5be Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 3 Aug 2008 15:21:40 +0000 Subject: Change a bunch of video/audio-output-specific preprocessor directives from a HAVE_ prefix to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27402 b3059339-0415-0410-9bf9-f77b7e298cf2 --- stream/stream_radio.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'stream/stream_radio.c') diff --git a/stream/stream_radio.c b/stream/stream_radio.c index 642e55a5f7..6714760e8d 100644 --- a/stream/stream_radio.c +++ b/stream/stream_radio.c @@ -35,21 +35,21 @@ #include #include -#ifdef HAVE_RADIO_BSDBT848 +#ifdef CONFIG_RADIO_BSDBT848 #include #ifdef IOCTL_BT848_H_NAME #include IOCTL_BT848_H_NAME #endif -#else // HAVE_RADIO_BSDBT848 +#else /* CONFIG_RADIO_BSDBT848 */ #include -#ifdef HAVE_RADIO_V4L2 +#ifdef CONFIG_RADIO_V4L2 #include #endif -#ifdef HAVE_RADIO_V4L +#ifdef CONFIG_RADIO_V4L #include #warning "V4L is deprecated and will be removed in future" #endif @@ -91,7 +91,7 @@ typedef struct radio_channels_s { /// default values for options radio_param_t stream_radio_defaults={ -#ifdef HAVE_RADIO_BSDBT848 +#ifdef CONFIG_RADIO_BSDBT848 "/dev/tuner0", //device 87.50, //freq_min 108.00, //freq_max @@ -252,7 +252,7 @@ static int parse_channels(radio_priv_t* priv,float freq_channel,float* pfreq){ return STREAM_OK; } -#ifdef HAVE_RADIO_V4L2 +#ifdef CONFIG_RADIO_V4L2 /***************************************************************** * \brief get fraction value for using in set_frequency and get_frequency * \return STREAM_OK if success, STREAM_ERROR otherwise @@ -409,8 +409,8 @@ static const radio_driver_t radio_driver_v4l2={ set_frequency_v4l2, get_frequency_v4l2 }; -#endif //HAVE_RADIO_V4L2 -#ifdef HAVE_RADIO_V4L +#endif /* CONFIG_RADIO_V4L2 */ +#ifdef CONFIG_RADIO_V4L /***************************************************************** * \brief get fraction value for using in set_frequency and get_frequency * \return STREAM_OK if success, STREAM_ERROR otherwise @@ -540,8 +540,8 @@ static const radio_driver_t radio_driver_v4l={ set_frequency_v4l, get_frequency_v4l }; -#endif //HAVE_RADIO_V4L -#ifdef HAVE_RADIO_BSDBT848 +#endif /* CONFIG_RADIO_V4L */ +#ifdef CONFIG_RADIO_BSDBT848 /***************************************************************** * \brief get fraction value for using in set_frequency and get_frequency @@ -652,7 +652,7 @@ static const radio_driver_t radio_driver_bsdbt848={ set_frequency_bsdbt848, get_frequency_bsdbt848 }; -#endif //HAVE_RADIO_BSDBT848 +#endif /* CONFIG_RADIO_BSDBT848 */ static inline int init_frac(radio_priv_t* priv){ return priv->driver->init_frac(priv); @@ -1080,13 +1080,13 @@ static int fill_buffer_s(struct stream_st *s, char* buffer, int max_len){ when no driver explicitly specified first available will be used */ static const radio_driver_t* radio_drivers[]={ -#ifdef HAVE_RADIO_BSDBT848 +#ifdef CONFIG_RADIO_BSDBT848 &radio_driver_bsdbt848, #endif -#ifdef HAVE_RADIO_V4L2 +#ifdef CONFIG_RADIO_V4L2 &radio_driver_v4l2, #endif -#ifdef HAVE_RADIO_V4L +#ifdef CONFIG_RADIO_V4L &radio_driver_v4l, #endif 0 -- cgit v1.2.3 From f83e779ee4c356947770069f6ccc993d23e981e3 Mon Sep 17 00:00:00 2001 From: diego 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 --- stream/stream_radio.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'stream/stream_radio.c') diff --git a/stream/stream_radio.c b/stream/stream_radio.c index 6714760e8d..3002ee38c7 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(HAVE_ALSA9) || defined(HAVE_ALSA1X) +#if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X) 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(HAVE_ALSA9) || defined(HAVE_ALSA1X) +#if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X) 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(HAVE_ALSA9) || defined(HAVE_ALSA1X) +#if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X) if(!is_oss) snd_pcm_nonblock(priv->audio_in.alsa.handle,1); #endif -- cgit v1.2.3 From 024b6efdf1439c2573350048a433d0324dcee349 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 6 Aug 2008 23:19:29 +0000 Subject: 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 --- stream/stream_radio.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'stream/stream_radio.c') 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 -- cgit v1.2.3