sysmocom
/
pjproject
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@5197 74dad513-b988-da41-8d7b-12977e46ad98
This commit is contained in:
Nanang Izzuddin 2015-11-09 10:28:16 +00:00
parent 0c9dd1d3d0
commit a9a3238ed9
3 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
aconfigure
View File

@ -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

2
aconfigure.ac
View File

@ -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
;;

22
pjmedia/build/os-auto.mak.in
View File

@ -195,10 +195,21 @@ 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
#
@ -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