diff options
| author | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2001-07-18 21:38:16 +0000 |
|---|---|---|
| committer | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2001-07-18 21:38:16 +0000 |
| commit | a785a3e404bdba9e901431cf9d2e047e8d4b4c1a (patch) | |
| tree | c31784d3351c1c9728af1fc6a4bf300b5ef02397 /src/audio_out | |
| parent | 0cc3c12037389df276f5233ea5d5bcd7929ddc18 (diff) | |
| download | xine-lib-a785a3e404bdba9e901431cf9d2e047e8d4b4c1a.tar.gz xine-lib-a785a3e404bdba9e901431cf9d2e047e8d4b4c1a.tar.bz2 | |
Split alsa drivers, more checks about versions. Made xine lib c++ compliant.
CVS patchset: 308
CVS date: 2001/07/18 21:38:16
Diffstat (limited to 'src/audio_out')
| -rw-r--r-- | src/audio_out/Makefile.am | 14 | ||||
| -rw-r--r-- | src/audio_out/audio_alsa05_out.c | 6 | ||||
| -rw-r--r-- | src/audio_out/audio_alsa_out.c | 6 |
3 files changed, 13 insertions, 13 deletions
diff --git a/src/audio_out/Makefile.am b/src/audio_out/Makefile.am index bf44d5940..00368063d 100644 --- a/src/audio_out/Makefile.am +++ b/src/audio_out/Makefile.am @@ -17,8 +17,13 @@ endif # on the alsa project side # if HAVE_ALSA +if HAVE_ALSA05 +alsa05_module = xineplug_ao_out_alsa05.la +endif +if HAVE_ALSA09 alsa_module = xineplug_ao_out_alsa.la endif +endif if HAVE_ESD esd_module = xineplug_ao_out_esd.la @@ -42,15 +47,18 @@ endif # All of xine audio out plugins should be named like the # scheme "xineplug_ao_out_" # -lib_LTLIBRARIES = $(oss_module) $(alsa_module) $(sun_module) \ +lib_LTLIBRARIES = $(oss_module) $(alsa05_module) $(alsa_module) $(sun_module) \ $(arts_module) $(esd_module) ## $(irixal_module) xineplug_ao_out_oss_la_SOURCES = audio_oss_out.c resample.c xineplug_ao_out_oss_la_LDFLAGS = -avoid-version -module -xineplug_ao_out_alsa_la_SOURCES = audio_alsa_out.c audio_alsa05_out.c \ - resample.c +xineplug_ao_out_alsa05_la_SOURCES = audio_alsa05_out.c resample.c +xineplug_ao_out_alsa05_la_LIBADD = $(ALSA_LIBS) +xineplug_ao_out_alsa05_la_LDFLAGS = -avoid-version -module + +xineplug_ao_out_alsa_la_SOURCES = audio_alsa_out.c resample.c xineplug_ao_out_alsa_la_LIBADD = $(ALSA_LIBS) xineplug_ao_out_alsa_la_LDFLAGS = -avoid-version -module diff --git a/src/audio_out/audio_alsa05_out.c b/src/audio_out/audio_alsa05_out.c index bbc4c281e..361e1a268 100644 --- a/src/audio_out/audio_alsa05_out.c +++ b/src/audio_out/audio_alsa05_out.c @@ -24,7 +24,7 @@ * for the SPDIF AC3 sync part * (c) 2000 Andy Lo A Foe <andy@alsaplayer.org> * - * $Id: audio_alsa05_out.c,v 1.4 2001/07/14 12:50:33 guenter Exp $ + * $Id: audio_alsa05_out.c,v 1.5 2001/07/18 21:38:16 f1rmb Exp $ */ /* required for swab() */ @@ -43,8 +43,6 @@ #include <unistd.h> #include <sys/asoundlib.h> -#if (SND_LIB_MAJOR == 0) && (SND_LIB_MINOR <= 5) - #include "xine_internal.h" #include "monitor.h" #include "audio_out.h" @@ -950,5 +948,3 @@ ao_functions_t *init_audio_out_plugin(config_values_t *config) { return &audio_alsaout; } - -#endif diff --git a/src/audio_out/audio_alsa_out.c b/src/audio_out/audio_alsa_out.c index 430aaeace..23632c96d 100644 --- a/src/audio_out/audio_alsa_out.c +++ b/src/audio_out/audio_alsa_out.c @@ -24,7 +24,7 @@ * (c) 2001 James Courtier-Dutton <James@superbug.demon.co.uk> * * - * $Id: audio_alsa_out.c,v 1.11 2001/06/30 23:09:25 guenter Exp $ + * $Id: audio_alsa_out.c,v 1.12 2001/07/18 21:38:16 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -42,8 +42,6 @@ #include <sys/ioctl.h> #include <inttypes.h> -#if (SND_LIB_MAJOR >= 0) && (SND_LIB_MINOR >= 9) - #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) #define error(...) do {\ fprintf(stderr, "XINE lib %s:%d:(%s) ", __FILE__, __LINE__, __FUNCTION__); \ @@ -723,5 +721,3 @@ static ao_info_t ao_info_alsa = { ao_info_t *get_audio_out_plugin_info() { return &ao_info_alsa; } - -#endif /*(SND_LIB_MAJOR >= 0) && (SND_LIB_MINOR >= 9) */ |