Mercurial > mplayer.hg

changeset 28362:f0a0d87b7c56

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
1) HAVE_SYS_ASOUNDLIB_H/HAVE_ALSA_ASOUNDLIB_H are defined/undefined, not defined to 0/1, use them accordingly. 2) Add ESD definitions to avoid undefined preprocessor directives warnings.
author diego
date Fri, 30 Jan 2009 23:21:23 +0000
parents 68723bca30ee
children 7baa7292f575
files libao2/ao_alsa.c libao2/ao_esd.c
diffstat 2 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libao2/ao_alsa.c	Fri Jan 30 23:19:00 2009 +0000
+++ b/libao2/ao_alsa.c	Fri Jan 30 23:21:23 2009 +0000
@@ -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"
--- a/libao2/ao_esd.c	Fri Jan 30 23:19:00 2009 +0000
+++ b/libao2/ao_esd.c	Fri Jan 30 23:21:23 2009 +0000
@@ -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__)