diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-01-30 23:21:23 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-01-30 23:21:23 +0000 |
| commit | 390a1afef09893b42c3f8f7463042df76bb4fb86 (patch) | |
| tree | 872448cc79f21062fdecdf93d0ad900998844252 /libao2 | |
| parent | 2c4882f890a889eb5731b0040732f4ddacbfc4da (diff) | |
| download | mpv-390a1afef09893b42c3f8f7463042df76bb4fb86.tar.bz2 mpv-390a1afef09893b42c3f8f7463042df76bb4fb86.tar.xz | |
1) HAVE_SYS_ASOUNDLIB_H/HAVE_ALSA_ASOUNDLIB_H are defined to 0/1,
not defined/undefined, use them accordingly.
2) Add ESD definitions to avoid undefined preprocessor directives warnings.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28397 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libao2')
| -rw-r--r-- | libao2/ao_alsa.c | 4 | ||||
| -rw-r--r-- | libao2/ao_esd.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/libao2/ao_alsa.c b/libao2/ao_alsa.c index 8e32b7fb49..6d2e1f959f 100644 --- a/libao2/ao_alsa.c +++ b/libao2/ao_alsa.c @@ -44,9 +44,9 @@ #define ALSA_PCM_NEW_HW_PARAMS_API #define ALSA_PCM_NEW_SW_PARAMS_API -#if HAVE_SYS_ASOUNDLIB_H +#ifdef HAVE_SYS_ASOUNDLIB_H #include <sys/asoundlib.h> -#elif HAVE_ALSA_ASOUNDLIB_H +#elif defined(HAVE_ALSA_ASOUNDLIB_H) #include <alsa/asoundlib.h> #else #error "asoundlib.h is not in sys/ or alsa/ - please bugreport" diff --git a/libao2/ao_esd.c b/libao2/ao_esd.c index 56a73ff555..a5602ff894 100644 --- a/libao2/ao_esd.c +++ b/libao2/ao_esd.c @@ -54,7 +54,8 @@ #include "help_mp.h" -#undef ESD_DEBUG +#define ESD_RESAMPLES 0 +#define ESD_DEBUG 0 #if ESD_DEBUG #define dprintf(...) printf(__VA_ARGS__) |