diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-06-12 22:32:26 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-06-12 22:32:26 +0100 |
| commit | 58d9467d1b2188463b216b79b51a423559e97a75 (patch) | |
| tree | 233624f3ae7213c376b6b293160b153061ed7e43 /src/audio_out | |
| parent | aba1fd253b3a2c5cfa13e13eefea469e4e3dff9b (diff) | |
| parent | 125e98b02c9d62e09e154f176aacc2b9c51fd164 (diff) | |
| download | xine-lib-58d9467d1b2188463b216b79b51a423559e97a75.tar.gz xine-lib-58d9467d1b2188463b216b79b51a423559e97a75.tar.bz2 | |
A nice simple merge from 1.1.
Hopefully, I've applied all of the $(LTLIBINTL) changes correctly...
Diffstat (limited to 'src/audio_out')
| -rw-r--r-- | src/audio_out/Makefile.am | 14 | ||||
| -rw-r--r-- | src/audio_out/audio_alsa_out.c | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/audio_out/Makefile.am b/src/audio_out/Makefile.am index cb3eb79d3..6eafd507e 100644 --- a/src/audio_out/Makefile.am +++ b/src/audio_out/Makefile.am @@ -68,20 +68,20 @@ xineplug_LTLIBRARIES = \ $(jack_module) xineplug_ao_out_none_la_SOURCES = audio_none_out.c -xineplug_ao_out_none_la_LIBADD = $(XINE_LIB) +xineplug_ao_out_none_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) xineplug_ao_out_file_la_SOURCES = audio_file_out.c -xineplug_ao_out_file_la_LIBADD = $(XINE_LIB) +xineplug_ao_out_file_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) xineplug_ao_out_oss_la_SOURCES = audio_oss_out.c -xineplug_ao_out_oss_la_LIBADD = $(XINE_LIB) +xineplug_ao_out_oss_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) xineplug_ao_out_alsa_la_SOURCES = audio_alsa_out.c -xineplug_ao_out_alsa_la_LIBADD = $(ALSA_LIBS) $(XINE_LIB) $(PTHREAD_LIBS) +xineplug_ao_out_alsa_la_LIBADD = $(ALSA_LIBS) $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL) xineplug_ao_out_alsa_la_CFLAGS = $(AM_CFLAGS) $(ALSA_CFLAGS) xineplug_ao_out_esd_la_SOURCES = audio_esd_out.c -xineplug_ao_out_esd_la_LIBADD = $(ESD_LIBS) $(XINE_LIB) +xineplug_ao_out_esd_la_LIBADD = $(ESD_LIBS) $(XINE_LIB) $(LTLIBINTL) xineplug_ao_out_esd_la_CFLAGS = $(AM_CFLAGS) $(ESD_CFLAGS) xineplug_ao_out_sun_la_SOURCES = audio_sun_out.c @@ -100,7 +100,7 @@ xineplug_ao_out_coreaudio_la_LIBADD = $(XINE_LIB) xineplug_ao_out_coreaudio_la_LDFLAGS = $(AM_LDFLAGS) -framework CoreAudio -framework AudioUnit xineplug_ao_out_pulseaudio_la_SOURCES = audio_pulse_out.c -xineplug_ao_out_pulseaudio_la_LIBADD = $(PULSEAUDIO_LIBS) $(XINE_LIB) +xineplug_ao_out_pulseaudio_la_LIBADD = $(PULSEAUDIO_LIBS) $(XINE_LIB) $(LTLIBINTL) xineplug_ao_out_pulseaudio_la_CFLAGS = $(AM_CFLAGS) $(PULSEAUDIO_CFLAGS) xineplug_ao_out_directx2_la_SOURCES = audio_directx2_out.c @@ -112,5 +112,5 @@ xineplug_ao_out_fusionsound_la_LIBADD = $(FUSIONSOUND_LIBS) $(XINE_LIB) xineplug_ao_out_fusionsound_la_CFLAGS = $(AM_CFLAGS) $(FUSIONSOUND_CFLAGS) xineplug_ao_out_jack_la_SOURCES = audio_jack_out.c -xineplug_ao_out_jack_la_LIBADD = $(JACK_LIBS) $(XINE_LIB) +xineplug_ao_out_jack_la_LIBADD = $(JACK_LIBS) $(XINE_LIB) $(LTLIBINTL) xineplug_ao_out_jack_la_CFLAGS = $(AM_FLAGS) $(JACK_CFLAGS) diff --git a/src/audio_out/audio_alsa_out.c b/src/audio_out/audio_alsa_out.c index ce3e7fb2b..3aef7978d 100644 --- a/src/audio_out/audio_alsa_out.c +++ b/src/audio_out/audio_alsa_out.c @@ -41,7 +41,9 @@ #include <stdlib.h> #include <fcntl.h> #include <math.h> +#ifdef HAVE_ALLOCA_H #include <alloca.h> +#endif #define ALSA_PCM_NEW_HW_PARAMS_API #define ALSA_PCM_NEW_SW_PARAMS_API |