X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faudio_output%2FModules.am;h=eb0bdc6760a3854b21ee66b04094ea208348cdb9;hb=1ab9abf37e549f6dd500e15dd3bf0c16dc29bdde;hp=92e9ce0d77aae96631c24a4ab8f5320cc3a973a2;hpb=0b087d2113eedf04f1d72a6052e316dc0d7526bf;p=vlc

diff --git a/modules/audio_output/Modules.am b/modules/audio_output/Modules.am
index 92e9ce0d77..eb0bdc6760 100644
--- a/modules/audio_output/Modules.am
+++ b/modules/audio_output/Modules.am
@@ -1,28 +1,40 @@
-SOURCES_aout_file = file.c
-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
+
+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 libopensles_android_plugin.la
+endif
 
 libadummy_plugin_la_SOURCES = adummy.c
 libadummy_plugin_la_CFLAGS = $(AM_CFLAGS)
 libadummy_plugin_la_LIBADD = $(AM_LIBADD)
-libadummy_plugin_la_DEPENDENCIES =
+
+libafile_plugin_la_SOURCES = file.c
+libafile_plugin_la_CFLAGS = $(AM_CFLAGS)
+libafile_plugin_la_LIBADD = $(AM_LIBADD)
 
 libamem_plugin_la_SOURCES = amem.c
 libamem_plugin_la_CFLAGS = $(AM_CFLAGS)
 libamem_plugin_la_LIBADD = $(AM_LIBADD)
-libamem_plugin_la_DEPENDENCIES =
 
 libvlc_LTLIBRARIES += \
 	libadummy_plugin.la \
-	libamem_plugin.la \
-	libaout_file_plugin.la
+	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)
-liboss_plugin_la_DEPENDENCIES =
 if HAVE_OSS
 libvlc_LTLIBRARIES += liboss_plugin.la
 endif
@@ -30,7 +42,6 @@ endif
 libalsa_plugin_la_SOURCES = alsa.c volume.h
 libalsa_plugin_la_CFLAGS = $(AM_CFLAGS) $(ALSA_CFLAGS)
 libalsa_plugin_la_LIBADD = $(AM_LIBADD) $(ALSA_LIBS) $(LIBM)
-libalsa_plugin_la_DEPENDENCIES =
 if HAVE_ALSA
 libvlc_LTLIBRARIES += libalsa_plugin.la
 endif
@@ -38,30 +49,33 @@ endif
 libpulse_plugin_la_SOURCES = vlcpulse.c vlcpulse.h pulse.c
 libpulse_plugin_la_CFLAGS = $(AM_CFLAGS) $(PULSE_CFLAGS)
 libpulse_plugin_la_LIBADD = $(AM_LIBADD) $(PULSE_LIBS) $(LIBM)
-libpulse_plugin_la_DEPENDENCIES =
 if HAVE_PULSE
 libvlc_LTLIBRARIES += libpulse_plugin.la
 endif
 
-libjack_plugin_la_SOURCES = oss.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)
-libjack_plugin_la_DEPENDENCIES =
 EXTRA_LTLIBRARIES += libjack_plugin.la
 libvlc_LTLIBRARIES += $(LTLIBjack)
 
-libdirectsound_plugin_la_SOURCES = directx.c windows_audio_common.h packet.c
+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 += libmmdevice_plugin.la
+endif
+
+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_DEPENDENCIES =
+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)
-libkai_plugin_la_DEPENDENCIES =
 if HAVE_KAI
 libvlc_LTLIBRARIES += libkai_plugin.la
 endif
@@ -69,7 +83,6 @@ endif
 libsndio_plugin_la_SOURCES = sndio.c
 libsndio_plugin_la_CFLAGS = $(AM_CFLAGS)
 libsndio_plugin_la_LIBADD = $(AM_LIBADD) -lsndio
-libsndio_plugin_la_DEPENDENCIES =
 if HAVE_SNDIO
 libvlc_LTLIBRARIES += libsndio_plugin.la
 endif