Changeset 3079

Timestamp:

Jan 27, 2010 5:22:17 PM (15 years ago)

Author:

bennylp

Message:

Initial implementation of ticket #1016: Native Linux ALSA audio device backend implementation

Location:

pjproject/trunk/pjmedia

Files:

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

pjproject/trunk/pjmedia/build/Makefile

@@ -73 +73 @@
 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
+                                 wmme_dev.o alsa_dev.o
 export PJMEDIA_AUDIODEV_CFLAGS += $(_CFLAGS)
 

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

@@ -56 +56 @@
 #       define PJMEDIA_AUDIO_DEV_HAS_PORTAUDIO  1
 #   endif
+#endif
+
+
+/**
+ * This setting controls whether native ALSA support should be included.
+ */
+#ifndef PJMEDIA_AUDIO_DEV_HAS_ALSA
+#   define PJMEDIA_AUDIO_DEV_HAS_ALSA           0
 #endif
 

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

@@ -71 +71 @@
 #endif
 
+#if PJMEDIA_AUDIO_DEV_HAS_ALSA
+pjmedia_aud_dev_factory* pjmedia_alsa_factory(pj_pool_factory *pf);
+#endif
+
 #if PJMEDIA_AUDIO_DEV_HAS_WMME
 pjmedia_aud_dev_factory* pjmedia_wmme_factory(pj_pool_factory *pf);
@@ -369 +373 @@
 
     /* Register creation functions */
+#if PJMEDIA_AUDIO_DEV_HAS_ALSA
+    aud_subsys.drv[aud_subsys.drv_cnt++].create = &pjmedia_alsa_factory;
+#endif
 #if PJMEDIA_AUDIO_DEV_HAS_PORTAUDIO
     aud_subsys.drv[aud_subsys.drv_cnt++].create = &pjmedia_pa_factory;