[MPlayer-cvslog] r28397 - in trunk/libao2: ao_alsa.c ao_esd.c

[diego]

Author: diego
Date: Sat Jan 31 00:21:23 2009
New Revision: 28397

Log:
HAVE_SYS_ASOUNDLIB_H/HAVE_ALSA_ASOUNDLIB_H are defined to 0/1,
not defined/undefined, use them accordingly.

Modified:
   trunk/libao2/ao_alsa.c
   trunk/libao2/ao_esd.c

Modified: trunk/libao2/ao_alsa.c
==============================================================================
--- trunk/libao2/ao_alsa.c	Sat Jan 31 00:19:00 2009	(r28396)
+++ trunk/libao2/ao_alsa.c	Sat Jan 31 00:21:23 2009	(r28397)
@@ -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"

Modified: trunk/libao2/ao_esd.c
==============================================================================
--- trunk/libao2/ao_esd.c	Sat Jan 31 00:19:00 2009	(r28396)
+++ trunk/libao2/ao_esd.c	Sat Jan 31 00:21:23 2009	(r28397)
@@ -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__)