Changeset 2182

Timestamp:

Jul 28, 2008 11:40:58 PM (16 years ago)

Author:

bennylp

Message:

Ticket #463: Configuration option to have external sound device implementation

Location:

pjproject/trunk

Files:

• aconfigure (modified) (2 diffs)
• aconfigure.ac (modified) (1 diff)
• pjmedia/build/os-auto.mak.in (modified) (3 diffs)
• pjmedia/include/pjmedia/config.h (modified) (1 diff)
• pjsip-apps/build/Makefile (modified) (1 diff)

pjproject/trunk/aconfigure

@@ -860 +860 @@
   --disable-oss           Disable OSS audio (default: not disabled)
 
+  --enable-ext-sound      PJMEDIA will not provide any sound device backend
   --disable-small-filter  Exclude small filter in resampling
   --disable-large-filter  Exclude large filter in resampling
@@ -10206 +10207 @@
  esac
 fi
+
+# Check whether --enable-ext_sound or --disable-ext_sound was given.
+if test "${enable_ext_sound+set}" = set; then
+  enableval="$enable_ext_sound"
+  if test "$enable_ext_sound" = "yes"; then
+                ac_pjmedia_snd=external
+                echo "$as_me:$LINENO: result: Checking if external sound is set... yes" >&5
+echo "${ECHO_T}Checking if external sound is set... yes" >&6
+               fi
+
+fi;
 
 

pjproject/trunk/aconfigure.ac

@@ -415 +415 @@
 fi
 
+AC_ARG_ENABLE(ext_sound,
+              AC_HELP_STRING([--enable-ext-sound],
+                             [PJMEDIA will not provide any sound device backend]),
+              [if test "$enable_ext_sound" = "yes"; then
+                [ac_pjmedia_snd=external]
+                AC_MSG_RESULT([Checking if external sound is set... yes])
+               fi]
+              )
+
 dnl # Include resampling small filter
 AC_SUBST(ac_no_small_filter)

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

@@ -12 +12 @@
 #   - ds:               Win32 DirectSound (dsound.c)
 #   - null:             Null sound device (nullsound.c)
+#   - external:         Link with no sounddev (app will provide)
 AC_PJMEDIA_SND=@ac_pjmedia_snd@
 
@@ -91 +92 @@
 
 #
-# Last resort, null sound device
+# Null sound device
 #
 ifeq ($(AC_PJMEDIA_SND),null)
@@ -98 +99 @@
 endif
 
+#
+# External sound device
+#
+ifeq ($(AC_PJMEDIA_SND),external)
+export SOUND_OBJS = 
+export CFLAGS += -DPJMEDIA_SOUND_IMPLEMENTATION=PJMEDIA_SOUND_EXTERNAL
+endif
 
+

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

@@ -56 +56 @@
 /** Constant for Win32 DirectSound sound backend. */
 #define PJMEDIA_SOUND_WIN32_DIRECT_SOUND    2
+
+/** When this is set, pjmedia will not provide any sound device backend. 
+ *  Application will have to provide its own sound device backend
+ *  and link the application with it.
+ */
+#define PJMEDIA_SOUND_EXTERNAL              3
 
 

pjproject/trunk/pjsip-apps/build/Makefile

@@ -35 +35 @@
                         main.o pjsua_app.o
 export PJSUA_CFLAGS += $(_CFLAGS)
-export PJSUA_LDFLAGS += $(APP_LDFLAGS) $(APP_LDLIBS)
+export PJSUA_LDFLAGS += $(APP_LDFLAGS) $(APP_LDLIBS) $(LDFLAGS)
 export PJSUA_EXE:=../bin/pjsua-$(TARGET_NAME)$(HOST_EXE)