diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-08-05 16:32:47 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-08-05 16:32:47 +0000 |
commit | f83e779ee4c356947770069f6ccc993d23e981e3 (patch) | |
tree | 067beff688854f664fd3cdfd1ead6eaf6a2d8eed | |
parent | f7faf638d49edf5c111ef4c1043e37a08afae682 (diff) | |
download | mpv-f83e779ee4c356947770069f6ccc993d23e981e3.tar.bz2 mpv-f83e779ee4c356947770069f6ccc993d23e981e3.tar.xz |
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
-rw-r--r-- | cfg-common.h | 4 | ||||
-rwxr-xr-x | configure | 32 | ||||
-rw-r--r-- | gui/cfg.c | 4 | ||||
-rw-r--r-- | gui/interface.c | 2 | ||||
-rw-r--r-- | gui/mplayer/gtk/opts.c | 12 | ||||
-rw-r--r-- | libao2/ao_esd.c | 2 | ||||
-rw-r--r-- | libao2/audio_out.c | 10 | ||||
-rw-r--r-- | stream/audio_in.c | 18 | ||||
-rw-r--r-- | stream/audio_in.h | 6 | ||||
-rw-r--r-- | stream/stream_radio.c | 6 | ||||
-rw-r--r-- | stream/tvi_v4l.c | 2 | ||||
-rw-r--r-- | stream/tvi_v4l2.c | 2 |
12 files changed, 50 insertions, 50 deletions
diff --git a/cfg-common.h b/cfg-common.h index 7481ae71f1..4bfa38e8bd 100644 --- a/cfg-common.h +++ b/cfg-common.h @@ -119,9 +119,9 @@ const m_option_t tvopts_conf[]={ {"mjpeg", &stream_tv_defaults.mjpeg, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"decimation", &stream_tv_defaults.decimation, CONF_TYPE_INT, CONF_RANGE, 1, 4, NULL}, {"quality", &stream_tv_defaults.quality, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL}, -#if defined(HAVE_ALSA9) || defined(HAVE_ALSA1X) +#if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X) {"alsa", &stream_tv_defaults.alsa, CONF_TYPE_FLAG, 0, 0, 1, NULL}, -#endif /* defined(HAVE_ALSA9) || defined(HAVE_ALSA1X) */ +#endif /* defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X) */ #endif /* defined(CONFIG_TV_V4L) || defined(CONFIG_TV_V4L2) */ {"adevice", &stream_tv_defaults.adevice, CONF_TYPE_STRING, 0, 0, 0, NULL}, #ifdef CONFIG_TV_TELETEXT @@ -4873,12 +4873,12 @@ EOF cc_check -lwinmm && _win32waveout=yes fi if test "$_win32waveout" = yes ; then - _def_win32waveout='#define HAVE_WIN32WAVEOUT 1' + _def_win32waveout='#define CONFIG_WIN32WAVEOUT 1' _libs_mplayer="$_libs_mplayer -lwinmm" _aosrc="$_aosrc ao_win32.c" _aomodules="win32 $_aomodules" else - _def_win32waveout='#undef HAVE_WIN32WAVEOUT' + _def_win32waveout='#undef CONFIG_WIN32WAVEOUT' _noaomodules="win32 $_noaomodules" fi echores "$_win32waveout" @@ -4895,14 +4895,14 @@ EOF cc_check -lgdi32 && _directx=yes fi if test "$_directx" = yes ; then - _def_directx='#define HAVE_DIRECTX 1' + _def_directx='#define CONFIG_DIRECTX 1' _libs_mplayer="$_libs_mplayer -lgdi32" _vosrc="$_vosrc vo_directx.c" _vomodules="directx $_vomodules" _aosrc="$_aosrc ao_dsound.c" _aomodules="dsound $_aomodules" else - _def_directx='#undef HAVE_DIRECTX' + _def_directx='#undef CONFIG_DIRECTX' _novomodules="directx $_novomodules" _noaomodules="dsound $_noaomodules" fi @@ -4921,13 +4921,13 @@ EOF cc_check $_ld_lm -laudio -lXt && _nas=yes fi if test "$_nas" = yes ; then - _def_nas='#define HAVE_NAS 1' + _def_nas='#define CONFIG_NAS 1' _libs_mplayer="$_libs_mplayer -laudio -lXt" _aosrc="$_aosrc ao_nas.c" _aomodules="nas $_aomodules" else _noaomodules="nas $_noaomodules" - _def_nas='#undef HAVE_NAS' + _def_nas='#undef CONFIG_NAS' fi echores "$_nas" @@ -5151,11 +5151,11 @@ if test "$_esd" = yes ; then #include <esd.h> int main(void) { return esd_get_latency(0); } EOF - cc_check `esd-config --libs` `esd-config --cflags` && _esd_latency=yes && _def_esd_latency='#define HAVE_ESD_LATENCY' + cc_check `esd-config --libs` `esd-config --cflags` && _esd_latency=yes && _def_esd_latency='#define CONFIG_ESD_LATENCY' echores "$_esd_latency" else _def_esd='#undef CONFIG_ESD' - _def_esd_latency='#undef HAVE_ESD_LATENCY' + _def_esd_latency='#undef CONFIG_ESD_LATENCY' _noaomodules="esd $_noaomodules" fi @@ -5298,9 +5298,9 @@ int main(void) { return 0; } EOF cc_check -lasound $_ld_dl $_ld_pthread && _alsaver='1.0.x-alsa' fi -_def_alsa5='#undef HAVE_ALSA5' -_def_alsa9='#undef HAVE_ALSA9' -_def_alsa1x='#undef HAVE_ALSA1X' +_def_alsa5='#undef CONFIG_ALSA5' +_def_alsa9='#undef CONFIG_ALSA9' +_def_alsa1x='#undef CONFIG_ALSA1X' _def_sys_asoundlib_h='#undef HAVE_SYS_ASOUNDLIB_H' _def_alsa_asoundlib_h='#undef HAVE_ALSA_ASOUNDLIB_H' if test "$_alsaver" ; then @@ -5309,35 +5309,35 @@ if test "$_alsaver" ; then _alsa5=yes _aosrc="$_aosrc ao_alsa5.c" _aomodules="alsa5 $_aomodules" - _def_alsa5='#define HAVE_ALSA5 1' + _def_alsa5='#define CONFIG_ALSA5 1' _def_sys_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1' _res_comment="using alsa 0.5.x and sys/asoundlib.h" elif test "$_alsaver" = '0.9.x-sys' ; then _alsa9=yes _aosrc="$_aosrc ao_alsa.c" _aomodules="alsa $_aomodules" - _def_alsa9='#define HAVE_ALSA9 1' + _def_alsa9='#define CONFIG_ALSA9 1' _def_sys_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1' _res_comment="using alsa 0.9.x and sys/asoundlib.h" elif test "$_alsaver" = '0.9.x-alsa' ; then _alsa9=yes _aosrc="$_aosrc ao_alsa.c" _aomodules="alsa $_aomodules" - _def_alsa9='#define HAVE_ALSA9 1' + _def_alsa9='#define CONFIG_ALSA9 1' _def_alsa_asoundlib_h='#define HAVE_ALSA_ASOUNDLIB_H 1' _res_comment="using alsa 0.9.x and alsa/asoundlib.h" elif test "$_alsaver" = '1.0.x-sys' ; then _alsa1x=yes _aosrc="$_aosrc ao_alsa.c" _aomodules="alsa $_aomodules" - _def_alsa1x="#define HAVE_ALSA1X 1" + _def_alsa1x="#define CONFIG_ALSA1X 1" _def_alsa_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1' _res_comment="using alsa 1.0.x and sys/asoundlib.h" elif test "$_alsaver" = '1.0.x-alsa' ; then _alsa1x=yes _aosrc="$_aosrc ao_alsa.c" _aomodules="alsa $_aomodules" - _def_alsa1x="#define HAVE_ALSA1X 1" + _def_alsa1x="#define CONFIG_ALSA1X 1" _def_alsa_asoundlib_h='#define HAVE_ALSA_ASOUNDLIB_H 1' _res_comment="using alsa 1.0.x and alsa/asoundlib.h" else @@ -58,7 +58,7 @@ char * gtkAOOSSMixer; char * gtkAOOSSMixerChannel; char * gtkAOOSSDevice; #endif -#if defined(HAVE_ALSA9) || defined (HAVE_ALSA1X) +#if defined(CONFIG_ALSA9) || defined (CONFIG_ALSA1X) 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(HAVE_ALSA9) || defined (HAVE_ALSA1X) +#if defined(CONFIG_ALSA9) || defined (CONFIG_ALSA1X) { "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 c60f5321b0..3b0cd78066 100644 --- a/gui/interface.c +++ b/gui/interface.c @@ -842,7 +842,7 @@ int guiGetEvent( int type,char * arg ) free(tmp); } #endif -#if defined(HAVE_ALSA9) || defined (HAVE_ALSA1X) +#if defined(CONFIG_ALSA9) || defined (CONFIG_ALSA1X) 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 027f931238..700050ae0d 100644 --- a/gui/mplayer/gtk/opts.c +++ b/gui/mplayer/gtk/opts.c @@ -1423,7 +1423,7 @@ GList *appendOSSMixerChannels(GList *l) { } #endif -#if defined(HAVE_ALSA9) || defined (HAVE_ALSA1X) +#if defined(CONFIG_ALSA9) || defined (CONFIG_ALSA1X) 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(HAVE_ALSA9) || defined (HAVE_ALSA1X) +#if defined(CONFIG_ALSA9) || defined (CONFIG_ALSA1X) 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(HAVE_ALSA9) || defined (HAVE_ALSA1X) +#if defined(CONFIG_ALSA9) || defined (CONFIG_ALSA1X) 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(HAVE_ALSA9) || defined (HAVE_ALSA1X) +#if defined(CONFIG_ALSA9) || defined (CONFIG_ALSA1X) 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(HAVE_ALSA9) || defined (HAVE_ALSA1X) +#if defined(CONFIG_ALSA9) || defined (CONFIG_ALSA1X) 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(HAVE_ALSA9) || defined (HAVE_ALSA1X) +#if defined(CONFIG_ALSA9) || defined (CONFIG_ALSA1X) if (strncmp(ao_driver[0], "alsa", 4) == 0) items = appendALSAMixerChannels(items); #endif diff --git a/libao2/ao_esd.c b/libao2/ao_esd.c index 83b52093d9..3eb1c2a8bd 100644 --- a/libao2/ao_esd.c +++ b/libao2/ao_esd.c @@ -216,7 +216,7 @@ static int init(int rate_hz, int channels, int format, int flags) * latency is number of samples @ 44.1khz stereo 16 bit * adjust according to rate_hz & bytes_per_sample */ -#ifdef HAVE_ESD_LATENCY +#ifdef CONFIG_ESD_LATENCY esd_latency = esd_get_latency(esd_fd); #else esd_latency = ((channels == 1 ? 2 : 1) * ESD_DEFAULT_RATE * diff --git a/libao2/audio_out.c b/libao2/audio_out.c index a29dd2f628..a2d2872e24 100644 --- a/libao2/audio_out.c +++ b/libao2/audio_out.c @@ -39,10 +39,10 @@ extern ao_functions_t audio_out_pss; const ao_functions_t* const audio_out_drivers[] = { // native: -#ifdef HAVE_DIRECTX +#ifdef CONFIG_DIRECTX &audio_out_dsound, #endif -#ifdef HAVE_WIN32WAVEOUT +#ifdef CONFIG_WIN32WAVEOUT &audio_out_win32, #endif #ifdef HAVE_COREAUDIO @@ -51,10 +51,10 @@ const ao_functions_t* const audio_out_drivers[] = #ifdef CONFIG_OSS_AUDIO &audio_out_oss, #endif -#if defined (HAVE_ALSA1X) || defined (HAVE_ALSA9) +#if defined (CONFIG_ALSA1X) || defined (CONFIG_ALSA9) &audio_out_alsa, #endif -#ifdef HAVE_ALSA5 +#ifdef CONFIG_ALSA5 &audio_out_alsa5, #endif #ifdef CONFIG_SGI_AUDIO @@ -76,7 +76,7 @@ const ao_functions_t* const audio_out_drivers[] = #ifdef CONFIG_JACK &audio_out_jack, #endif -#ifdef HAVE_NAS +#ifdef CONFIG_NAS &audio_out_nas, #endif #ifdef CONFIG_SDL diff --git a/stream/audio_in.c b/stream/audio_in.c index 2b2497a8d9..2a988ef84f 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(HAVE_ALSA9) || defined(HAVE_ALSA1X) +#if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X) 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(HAVE_ALSA9) || defined(HAVE_ALSA1X) +#if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X) 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(HAVE_ALSA9) || defined(HAVE_ALSA1X) +#if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X) 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(HAVE_ALSA9) || defined(HAVE_ALSA1X) +#if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X) 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(HAVE_ALSA9) || defined(HAVE_ALSA1X) +#if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X) int i; #endif if (ai->setup) return -1; switch (ai->type) { -#if defined(HAVE_ALSA9) || defined(HAVE_ALSA1X) +#if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X) 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(HAVE_ALSA9) || defined(HAVE_ALSA1X) +#if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X) 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(HAVE_ALSA9) || defined(HAVE_ALSA1X) +#if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X) 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(HAVE_ALSA9) || defined(HAVE_ALSA1X) +#if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X) 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 735e9f4e0e..ee22571234 100644 --- a/stream/audio_in.h +++ b/stream/audio_in.h @@ -6,7 +6,7 @@ #include "config.h" -#if defined(HAVE_ALSA9) || defined(HAVE_ALSA1X) +#if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X) #include <alsa/asoundlib.h> typedef struct { @@ -43,7 +43,7 @@ typedef struct int bytes_per_sample; int samplesize; -#if defined(HAVE_ALSA9) || defined(HAVE_ALSA1X) +#if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X) 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(HAVE_ALSA9) || defined(HAVE_ALSA1X) +#if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X) 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 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 diff --git a/stream/tvi_v4l.c b/stream/tvi_v4l.c index bdaab01d61..b5c647241c 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(HAVE_ALSA9) || defined(HAVE_ALSA1X) +#if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X) 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 c7d39841aa..4a273a1b35 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(HAVE_ALSA9) || defined(HAVE_ALSA1X) +#if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X) if (priv->tv_param->alsa) audio_in_init(&priv->audio_in, AUDIO_IN_ALSA); else |