Changeset 3102

Timestamp:

Feb 19, 2010 9:57:48 AM (15 years ago)

Author:

ming

Message:

Implemented ticket #1038: null audio device

• pjmedia-audiodev:
  • implement null audio device
• build:
  • added null audio support on MMP, and Makefile (TODO: vs6 and vs2005)

Location:

pjproject/trunk

Files:

• build.symbian/pjmedia_audiodev.mmp (modified) (1 diff)
• pjmedia/build/Makefile (modified) (1 diff)
• pjmedia/include/pjmedia-audiodev/config.h (modified) (1 diff)
• pjmedia/src/pjmedia-audiodev/audiodev.c (modified) (2 diffs)
• pjmedia/src/pjmedia-audiodev/null_dev.c (added)

pjproject/trunk/build.symbian/pjmedia_audiodev.mmp

@@ -18 +18 @@
 SOURCE          symb_mda_dev.cpp
 SOURCE          symb_vas_dev.cpp
+SOURCE          null_dev.c
 
 SYSTEMINCLUDE   ..\pjmedia\include

pjproject/trunk/pjmedia/build/Makefile

@@ -72 +72 @@
 #
 export PJMEDIA_AUDIODEV_SRCDIR = ../src/pjmedia-audiodev
-export PJMEDIA_AUDIODEV_OBJS +=  audiodev.o audiotest.o errno.o legacy_dev.o pa_dev.o \
-                                 wmme_dev.o alsa_dev.o
+export PJMEDIA_AUDIODEV_OBJS +=  audiodev.o audiotest.o errno.o \
+                                 legacy_dev.o null_dev.o pa_dev.o wmme_dev.o alsa_dev.o
 export PJMEDIA_AUDIODEV_CFLAGS += $(_CFLAGS)
 

pjproject/trunk/pjmedia/include/pjmedia-audiodev/config.h

@@ -64 +64 @@
 #ifndef PJMEDIA_AUDIO_DEV_HAS_ALSA
 #   define PJMEDIA_AUDIO_DEV_HAS_ALSA           0
+#endif
+
+
+/**
+ * This setting controls whether null audio support should be included.
+ */
+#ifndef PJMEDIA_AUDIO_DEV_HAS_NULL_AUDIO
+#   define PJMEDIA_AUDIO_DEV_HAS_NULL_AUDIO     0
 #endif
 

pjproject/trunk/pjmedia/src/pjmedia-audiodev/audiodev.c

@@ -91 +91 @@
 #endif
 
+#if PJMEDIA_AUDIO_DEV_HAS_NULL_AUDIO
+pjmedia_aud_dev_factory* pjmedia_null_audio_factory(pj_pool_factory *pf);
+#endif
+
 #define MAX_DRIVERS     16
 #define MAX_DEVS        64
@@ -390 +394 @@
 #if PJMEDIA_AUDIO_DEV_HAS_SYMB_MDA
     aud_subsys.drv[aud_subsys.drv_cnt++].create = &pjmedia_symb_mda_factory;
+#endif
+#if PJMEDIA_AUDIO_DEV_HAS_NULL_AUDIO
+    aud_subsys.drv[aud_subsys.drv_cnt++].create = &pjmedia_null_audio_factory;
 #endif