Changeset 1116:c97579eb19a5 in mediastreamer2

Timestamp:

Jul 18, 2010 9:52:50 PM (3 years ago)

Author:

Jehan Monnier <jehan.monnier@…>

Branch:

default

Message:

add audiot unit base iPhone sound integration

Files:

• configure.ac (modified) (1 diff)
• include/mediastreamer2/allfilters.h (modified) (1 diff)
• src/Makefile.am (modified) (1 diff)
• src/mscommon.c (modified) (2 diffs)
• src/msiounit.c (added)

configure.ac

@@ -370 +370 @@
 AM_CONDITIONAL(BUILD_MACAQSND, test x$macaqsnd = xtrue)
 
+AC_ARG_ENABLE(iounit,
+      [  --enable-iounit    Turn on native apple iounit support (default=no)],
+      [case "${enableval}" in
+        yes) iounit=true ;;
+        no)  iounit=false ;;
+        *) AC_MSG_ERROR(bad value ${enableval} for --enable-iounit) ;;
+      esac],[iounit=false])
+
+if test "$iounit" = "true"; then
+        AC_DEFINE(__MACIOUNIT_ENABLED__,1,[defined if native apple iounit support is available])
+        iounit_enabled=true
+        found_sound=yes
+fi
+
+AM_CONDITIONAL(BUILD_MACIOUNIT, test x$iounit_enabled = xtrue)
+
 AC_ARG_ENABLE(jack,
       [  --disable-jack    Disable jack support],

include/mediastreamer2/allfilters.h

@@ -98 +98 @@
         MS_ITC_SOURCE_ID,
         MS_EXT_DISPLAY_ID,
-        MS_H264_DEC_ID
+        MS_H264_DEC_ID,
+        MS_IOUNIT_READ_ID,
+        MS_IOUNIT_WRITE_ID,
+        MS_ANDROID_SOUND_READ_ID,
+        MS_ANDROID_SOUND_WRITE_ID
 } MSFilterId;
 

src/Makefile.am

@@ -89 +89 @@
 endif
 
+if BUILD_MACIOUNIT
+libmediastreamer_la_SOURCES+=msiounit.c
+endif
+
 if BUILD_MACAQSND
 libmediastreamer_la_SOURCES+=aqsnd.c

src/mscommon.c

@@ -436 +436 @@
 #endif
 
+#ifdef __MACIOUNIT_ENABLED__
+extern MSSndCardDesc au_card_desc;
+#endif
+
 static MSSndCardDesc * ms_snd_card_descs[]={
 #ifdef __ALSA_ENABLED__
@@ -464 +468 @@
         &pulse_card_desc,
 #endif
-        NULL
+#ifdef __MACIOUNIT_ENABLED__
+        &au_card_desc,
+#endif
+NULL
 };