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 /libao2 | |
| 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
Diffstat (limited to 'libao2')
| -rw-r--r-- | libao2/ao_esd.c | 2 | ||||
| -rw-r--r-- | libao2/audio_out.c | 10 |
2 files changed, 6 insertions, 6 deletions
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 |