diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2015-11-09 10:28:16 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2015-11-09 10:28:16 +0000 |
| commit | 7e12e8056ea485736467f260c4b1e53da128b2d4 (patch) | |
| tree | f25daa50070357e2483123be2d8a7eb47b79ec6a | |
| parent | 64dc32039dc1b9e051c1e059a04e6c84b60b1392 (diff) | |
Close #1896: Update default audio device backend on MacOS to CoreAudio.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5197 74dad513-b988-da41-8d7b-12977e46ad98
| -rwxr-xr-x | aconfigure | 2 | ||||
| -rw-r--r-- | aconfigure.ac | 2 | ||||
| -rw-r--r-- | pjmedia/build/os-auto.mak.in | 22 |
3 files changed, 20 insertions, 6 deletions
@@ -6087,7 +6087,7 @@ $as_echo "Checking sound device backend... AudioUnit" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... old coreaudio" >&5 $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; } fi diff --git a/aconfigure.ac b/aconfigure.ac index 0a4dcd7f..c62017bf 100644 --- a/aconfigure.ac +++ b/aconfigure.ac @@ -637,7 +637,7 @@ else ac_pjmedia_snd=pa_old_darwinos 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 ;; diff --git a/pjmedia/build/os-auto.mak.in b/pjmedia/build/os-auto.mak.in index a6280a28..ab3627d7 100644 --- a/pjmedia/build/os-auto.mak.in +++ b/pjmedia/build/os-auto.mak.in @@ -195,11 +195,22 @@ ifeq (@ac_external_pa@,1) export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=1 else # Our PA in third_party -export CFLAGS += -I$(THIRD_PARTY)/build/portaudio -I$(THIRD_PARTY)/portaudio/include -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=1 +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 + +# # Windows specific # ifneq ($(findstring win32,$(AC_PJMEDIA_SND)),) @@ -212,14 +223,16 @@ endif # Null sound device # 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 # # External sound device # 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 # @@ -244,7 +257,8 @@ export PJMEDIA_VIDEODEV_OBJS += android_dev.o android_opengl.o endif # -# 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)) # Mac and iPhone OS specific, use obj-c |