Changeset 2740 for pjproject/trunk

Timestamp:

Jun 3, 2009 12:29:35 PM (15 years ago)

Author:

bennylp

Message:

Ticket #853: ./configure with --disable-sound argument does not work

• when --disable-sound is specified, no sound factory will be created
• modified audiodev.c to not return error when there's no device found
• compilation error in pa_dev.c when it's disabled and include path is not set

Location:

pjproject/trunk/pjmedia

Files:

• build/os-auto.mak.in (modified) (1 diff)
• src/pjmedia-audiodev/audiodev.c (modified) (1 diff)
• src/pjmedia-audiodev/pa_dev.c (modified) (1 diff)

pjproject/trunk/pjmedia/build/os-auto.mak.in

@@ -103 +103 @@
 #
 ifeq ($(AC_PJMEDIA_SND),null)
-# ***** Error ******
-# This will not work either with the new Audiodev
-export CFLAGS += -DPJMEDIA_SOUND_IMPLEMENTATION=PJMEDIA_SOUND_NULL_SOUND
+export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 -DPJMEDIA_AUDIO_DEV_HAS_WMME=0
 endif
 

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

@@ -345 +345 @@
 {
     unsigned i;
-    pj_status_t status = PJ_ENOMEM;
+    pj_status_t status = PJ_SUCCESS;
 
     /* Allow init() to be called multiple times as long as there is matching

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

@@ -23 +23 @@
 #include <pj/os.h>
 #include <pj/string.h>
+
+#if PJMEDIA_AUDIO_DEV_HAS_PORTAUDIO
+
 #include <portaudio.h>
-
-#if PJMEDIA_AUDIO_DEV_HAS_PORTAUDIO
-
 
 #define THIS_FILE       "pa_dev.c"