directsound: remove the broken msleep fallback

[vlc] / modules / audio_output / Modules.am

diff --git a/modules/audio_output/Modules.am b/modules/audio_output/Modules.am
index 7d6f71868683f5b483d9cf4d667e861d9789daa5..eb0bdc6760a3854b21ee66b04094ea208348cdb9 100644 (file)
--- a/modules/audio_output/Modules.am
+++ b/modules/audio_output/Modules.am
@@ -1,13 +1,18 @@
-SOURCES_waveout = waveout.c windows_audio_common.h packet.c
-SOURCES_auhal = auhal.c packet.c
-SOURCES_audioqueue = audioqueue.c packet.c
-SOURCES_opensles_android = opensles_android.c
+SOURCES_waveout = waveout.c windows_audio_common.h
+SOURCES_auhal = TPCircularBuffer.h TPCircularBuffer.c auhal.c
+SOURCES_audiounit_ios = TPCircularBuffer.h TPCircularBuffer.c audiounit_ios.c
+SOURCES_audioqueue = audioqueue.c
 
-libandroid_audiotrack_plugin_la_SOURCES = android_audiotrack.c
+libopensles_android_plugin_la_SOURCES = opensles_android.c
+libopensles_android_plugin_la_CFLAGS = $(AM_CFLAGS)
+libopensles_android_plugin_la_LIBADD = $(AM_LIBADD) -ldl -lm
+
+libandroid_audiotrack_plugin_la_SOURCES = audiotrack.c
 libandroid_audiotrack_plugin_la_CFLAGS = $(AM_CFLAGS)
 libandroid_audiotrack_plugin_la_LIBADD = $(AM_LIBADD) -ldl
+
 if HAVE_ANDROID
-libvlc_LTLIBRARIES += libandroid_audiotrack_plugin.la
+libvlc_LTLIBRARIES += libandroid_audiotrack_plugin.la libopensles_android_plugin.la
 endif
 
 libadummy_plugin_la_SOURCES = adummy.c
@@ -27,7 +32,7 @@ libvlc_LTLIBRARIES += \
        libafile_plugin.la \
        libamem_plugin.la
 
-liboss_plugin_la_SOURCES = oss.c packet.c volume.h
+liboss_plugin_la_SOURCES = oss.c volume.h
 liboss_plugin_la_CFLAGS = $(AM_CFLAGS)
 liboss_plugin_la_LIBADD = $(AM_LIBADD) $(OSS_LIBS) $(LIBM)
 if HAVE_OSS
@@ -48,27 +53,27 @@ if HAVE_PULSE
 libvlc_LTLIBRARIES += libpulse_plugin.la
 endif
 
-libjack_plugin_la_SOURCES = jack.c packet.c volume.h
+libjack_plugin_la_SOURCES = jack.c volume.h
 libjack_plugin_la_CFLAGS = $(AM_CFLAGS) $(JACK_CFLAGS)
 libjack_plugin_la_LIBADD = $(AM_LIBADD) $(JACK_LIBS) $(LIBM)
 EXTRA_LTLIBRARIES += libjack_plugin.la
 libvlc_LTLIBRARIES += $(LTLIBjack)
 
-libwasapi_plugin_la_SOURCES = wasapi.c
-libwasapi_plugin_la_CFLAGS = $(AM_CFLAGS)
-libwasapi_plugin_la_LIBADD = $(AM_LIBADD) -lole32 -lksuser
+libmmdevice_plugin_la_SOURCES = mmdevice.c mmdevice.h wasapi.c
+libmmdevice_plugin_la_CFLAGS = $(AM_CFLAGS)
+libmmdevice_plugin_la_LIBADD = $(AM_LIBADD) -lole32 -lksuser
 if HAVE_WASAPI
-libvlc_LTLIBRARIES += libwasapi_plugin.la
+libvlc_LTLIBRARIES += libmmdevice_plugin.la
 endif
 
-libdirectsound_plugin_la_SOURCES = directx.c windows_audio_common.h packet.c
+libdirectsound_plugin_la_SOURCES = directx.c windows_audio_common.h
 libdirectsound_plugin_la_CFLAGS = $(AM_CFLAGS)
-libdirectsound_plugin_la_LIBADD = $(AM_LIBADD)
+libdirectsound_plugin_la_LIBADD = $(AM_LIBADD) -lole32
 if HAVE_DIRECTX
 libvlc_LTLIBRARIES += libdirectsound_plugin.la
 endif
 
-libkai_plugin_la_SOURCES = kai.c packet.c
+libkai_plugin_la_SOURCES = kai.c
 libkai_plugin_la_CFLAGS = $(AM_CFLAGS)
 libkai_plugin_la_LIBADD = $(AM_LIBADD) $(KAI_LIBS)
 if HAVE_KAI