From 429bf7a9dc44a00460a4c8e183052f237f7bc4df Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 2 Aug 2008 20:35:29 +0000 Subject: cosmetics: typo fixes git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27400 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libao2/ao_mpegpes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libao2') diff --git a/libao2/ao_mpegpes.c b/libao2/ao_mpegpes.c index 3e9f51725a..a1dee788c5 100644 --- a/libao2/ao_mpegpes.c +++ b/libao2/ao_mpegpes.c @@ -52,7 +52,7 @@ static ao_info_t info = #ifdef HAVE_DVB "DVB audio output", #else - "Mpeg-PES audio output", + "MPEG-PES audio output", #endif "mpegpes", "A'rpi", -- cgit v1.2.3 From 52d358e3dcd4bc813441f6e23d8d9d212a18d7dd Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 2 Aug 2008 21:39:29 +0000 Subject: Set HAVE_DVB in configure when HAVE_DVB_HEAD is defined instead of doing in redundantly in DVB-specific files. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27401 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libao2/ao_mpegpes.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'libao2') diff --git a/libao2/ao_mpegpes.c b/libao2/ao_mpegpes.c index a1dee788c5..b1fb17ffde 100644 --- a/libao2/ao_mpegpes.c +++ b/libao2/ao_mpegpes.c @@ -10,10 +10,6 @@ #include "config.h" -#ifdef HAVE_DVB_HEAD -#define HAVE_DVB 1 -#endif - #ifdef HAVE_DVB #include #include -- cgit v1.2.3 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 --- libao2/audio_out.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libao2') diff --git a/libao2/audio_out.c b/libao2/audio_out.c index 77dd8b61ad..a29dd2f628 100644 --- a/libao2/audio_out.c +++ b/libao2/audio_out.c @@ -79,20 +79,20 @@ const ao_functions_t* const audio_out_drivers[] = #ifdef HAVE_NAS &audio_out_nas, #endif -#ifdef HAVE_SDL +#ifdef CONFIG_SDL &audio_out_sdl, #endif #ifdef CONFIG_OPENAL &audio_out_openal, #endif &audio_out_mpegpes, -#ifdef HAVE_DXR2 +#ifdef CONFIG_DXR2 &audio_out_dxr2, #endif -#ifdef HAVE_IVTV +#ifdef CONFIG_IVTV &audio_out_ivtv, #endif -#ifdef HAVE_V4L2_DECODER +#ifdef CONFIG_V4L2_DECODER &audio_out_v4l2, #endif &audio_out_null, -- 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 --- libao2/ao_esd.c | 2 +- libao2/audio_out.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'libao2') 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 -- cgit v1.2.3 From 473e2824cba09c93e9afb40a127ad5f07704c7ae Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 6 Aug 2008 07:42:26 +0000 Subject: Rename all preprocessor directives related to Apple / Mac OS X. Switch them from a HAVE_ to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27420 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libao2/audio_out.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libao2') diff --git a/libao2/audio_out.c b/libao2/audio_out.c index a2d2872e24..d9e756146b 100644 --- a/libao2/audio_out.c +++ b/libao2/audio_out.c @@ -45,7 +45,7 @@ const ao_functions_t* const audio_out_drivers[] = #ifdef CONFIG_WIN32WAVEOUT &audio_out_win32, #endif -#ifdef HAVE_COREAUDIO +#ifdef CONFIG_COREAUDIO &audio_out_macosx, #endif #ifdef CONFIG_OSS_AUDIO -- 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 --- libao2/audio_out.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libao2') diff --git a/libao2/audio_out.c b/libao2/audio_out.c index d9e756146b..38fad281be 100644 --- a/libao2/audio_out.c +++ b/libao2/audio_out.c @@ -51,7 +51,7 @@ const ao_functions_t* const audio_out_drivers[] = #ifdef CONFIG_OSS_AUDIO &audio_out_oss, #endif -#if defined (CONFIG_ALSA1X) || defined (CONFIG_ALSA9) +#ifdef CONFIG_ALSA &audio_out_alsa, #endif #ifdef CONFIG_ALSA5 -- cgit v1.2.3