qtsound: added audio capture functionality for MAC OS X

Tested with Built-in Input, Built-in Microphone and Griffin iMic USB system
Usage: qtsound://"Built-In Input" or qtsound://"iMic USB audio system"
Modified-by: Jean-Baptiste Kempf <jb@videolan.org>
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

configure.ac

@@ -2101,19 +2101,16 @@ then
 fi
 
 dnl
-dnl QTCapture
-AC_ARG_ENABLE(macosx-qtcapture,
-  [  --enable-macosx-qtcapture Mac OS X qtcapture (iSight) module (default enabled on Mac OS X)])
-if test "x${enable_macosx_qtcapture}" != "xno" &&
-  (test "${SYS}" = "darwin" || test "${enable_macosx_qtcapture}" = "yes")
+dnl QTKit
+AC_ARG_ENABLE(macosx-qtkit,
+  [  --enable-macosx-qtkit Mac OS X qtcapture (video) and qtsound (audio) module (default enabled on Mac OS X)])
+if test "x${enable_macosx_qtkit}" != "xno" &&
+  (test "${SYS}" = "darwin" || test "${enable_macosx_qtkit}" = "yes")
 then
-  VLC_ADD_LIBS([qtcapture], [-Wl,-framework,Cocoa])
-  VLC_ADD_LIBS([qtcapture], [-Wl,-framework,QTKit])
-  VLC_ADD_LIBS([qtcapture], [-Wl,-framework,CoreAudio])
-  VLC_ADD_LIBS([qtcapture], [-Wl,-framework,QuartzCore])
-  VLC_ADD_LIBS([qtcapture], [-Wl,-framework,CoreVideo])
   VLC_ADD_PLUGIN([qtcapture])
+  VLC_ADD_PLUGIN([qtsound])
 fi
+AM_CONDITIONAL(HAVE_QTKIT, [test "${SYS}" = "darwin" && "x${enable_macosx_qtkit}" != "xno"])
 
 
 dnl

modules/access/Modules.am

@@ -55,7 +55,6 @@ SOURCES_dvdnav = dvdnav.c
 SOURCES_dvdread = dvdread.c
 SOURCES_dc1394 = dc1394.c
 SOURCES_pvr = pvr.c
-SOURCES_qtcapture = qtcapture.m
 SOURCES_linsys_sdi = linsys/linsys_sdi.c linsys/linsys_sdi.h
 SOURCES_linsys_hdsdi = \
 	linsys/linsys_hdsdi.c \
@@ -83,6 +82,23 @@ SOURCES_htcpcp = htcpcp.c
 SOURCES_access_rar = rar/rar.c rar/rar.h rar/access.c
 SOURCES_stream_filter_rar = rar/rar.c rar/rar.h rar/stream.c
 
+if HAVE_QTKIT
+libqtcapture_plugin_la_SOURCES = qtcapture.m
+libqtcapture_plugin_la_LIBADDD = $(AM_LIBADD)
+libqtcapture_plugin_la_LDFLAGS = -Wl,-framework,Cocoa -Wl,-framework,QTKit -Wl,-framework,CoreVideo -Wl,-framework,QuartzCore
+libqtcapture_plugin_la_DEPENDENCIES =
+
+libqtsound_plugin_la_SOURCES = qtsound.m
+libqtsound_plugin_la_LIBADD = $(AM_LIBADD)
+libqtsound_plugin_la_LDFLAGS = -Wl,-framework,Cocoa -Wl,-framework,QTKit -Wl,-framework,CoreAudio
+libqtsound_plugin_la_DEPENDENCIES =
+
+libvlc_LTLIBRARIES += \
+        libqtcapture_plugin.la \
+        libqtsound_plugin.la \
+        $(NULL)
+endif
+
 libaccess_rtmp_plugin_la_SOURCES = \
         rtmp/access.c \
         rtmp/rtmp_amf_flv.c \