Changeset 5197

Timestamp:

Nov 9, 2015 10:28:16 AM (9 years ago)

Author:

nanang

Message:

Close #1896: Update default audio device backend on MacOS to CoreAudio?.

Location:

pjproject/trunk

Files:

• aconfigure (modified) (1 diff)
• aconfigure.ac (modified) (1 diff)
• pjmedia/build/os-auto.mak.in (modified) (4 diffs)

pjproject/trunk/aconfigure

@@ -6088 +6088 @@
 $as_echo "Checking sound device backend... old coreaudio" >&6; }
         else
-                ac_pjmedia_snd=pa_darwinos
+                ac_pjmedia_snd=coreaudio
                 { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... coreaudio" >&5
 $as_echo "Checking sound device backend... coreaudio" >&6; }

pjproject/trunk/aconfigure.ac

@@ -638 +638 @@
                 AC_MSG_RESULT([Checking sound device backend... old coreaudio])
         else
-                ac_pjmedia_snd=pa_darwinos
+                ac_pjmedia_snd=coreaudio
                 AC_MSG_RESULT([Checking sound device backend... coreaudio])
         fi

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

@@ -196 +196 @@
 else
 # Our PA in third_party
-export CFLAGS += -I$(THIRD_PARTY)/build/portaudio -I$(THIRD_PARTY)/portaudio/include -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=1
-endif
+export CFLAGS += -I$(THIRD_PARTY)/build/portaudio \
+                 -I$(THIRD_PARTY)/portaudio/include \
+                 -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=1
+endif
+endif
+
+#
+# MacOSX specific
+#
+ifneq ($(findstring coreaudio,$(AC_PJMEDIA_SND)),)
+export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_COREAUDIO=1 \
+                 -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 \
+                 -DPJMEDIA_AUDIO_DEV_HAS_WMME=0
 endif
 
@@ -213 +224 @@
 #
 ifeq ($(AC_PJMEDIA_SND),null)
-export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 -DPJMEDIA_AUDIO_DEV_HAS_WMME=0
+export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 \
+                 -DPJMEDIA_AUDIO_DEV_HAS_WMME=0
 endif
 
@@ -220 +232 @@
 #
 ifeq ($(AC_PJMEDIA_SND),external)
-export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 -DPJMEDIA_AUDIO_DEV_HAS_WMME=0
+export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 \
+                 -DPJMEDIA_AUDIO_DEV_HAS_WMME=0
 endif
 
@@ -245 +258 @@
 
 #
-# Determine whether we should compile the obj-c version of a particular source code
+# Determine whether we should compile the obj-c version of a particular
+# source code
 #
 ifneq (,$(filter $(AC_PJMEDIA_VIDEO),mac_os iphone_os))