diff options
| author | Benny Prijono <bennylp@teluu.com> | 2010-01-13 16:28:15 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2010-01-13 16:28:15 +0000 |
| commit | 2c9bdd7e514a478d3dc17a6b85a12dec20c15fb0 (patch) | |
| tree | c79aed89fc63fbc64c7b23d921caea30e0bed3a1 /pjmedia | |
| parent | 8cc7aef25ecc698b6fdfa620877f72e6b8dd536f (diff) | |
Ticket #1025: Support for using different PortAudio installation/path
- added --with-pa-path configure option
- remove the use of PaUtil_SetDebugPrintFunction() since this is not always available across all PA versions (?)
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3058 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia')
| -rw-r--r-- | pjmedia/build/Makefile | 1 | ||||
| -rw-r--r-- | pjmedia/build/os-auto.mak.in | 6 | ||||
| -rw-r--r-- | pjmedia/src/pjmedia-audiodev/pa_dev.c | 9 |
3 files changed, 15 insertions, 1 deletions
diff --git a/pjmedia/build/Makefile b/pjmedia/build/Makefile index dae6d61b..49cd9424 100644 --- a/pjmedia/build/Makefile +++ b/pjmedia/build/Makefile @@ -1,7 +1,6 @@ include ../../build.mak THIRD_PARTY:=$(PJDIR)/third_party -PA_DIR := $(THIRD_PARTY)/build/portaudio/src SRTP_INC=$(CC_INC)$(THIRD_PARTY)/build/srtp \ $(CC_INC)$(THIRD_PARTY)/srtp/crypto/include \ diff --git a/pjmedia/build/os-auto.mak.in b/pjmedia/build/os-auto.mak.in index 5b80ea2d..a7a153e7 100644 --- a/pjmedia/build/os-auto.mak.in +++ b/pjmedia/build/os-auto.mak.in @@ -86,7 +86,13 @@ endif # PortAudio # ifneq ($(findstring pa,$(AC_PJMEDIA_SND)),) +ifeq (x@ac_pa_path@,x) +# Our PA in third_party export CFLAGS += -I$(THIRD_PARTY)/build/portaudio -I$(THIRD_PARTY)/portaudio/include -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=1 +else +# External PA +export CFLAGS += -I@ac_pa_path@/include -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=1 +endif endif # diff --git a/pjmedia/src/pjmedia-audiodev/pa_dev.c b/pjmedia/src/pjmedia-audiodev/pa_dev.c index 53cca042..095f7725 100644 --- a/pjmedia/src/pjmedia-audiodev/pa_dev.c +++ b/pjmedia/src/pjmedia-audiodev/pa_dev.c @@ -30,6 +30,11 @@ #define THIS_FILE "pa_dev.c" #define DRIVER_NAME "PA" +/* Enable call to PaUtil_SetDebugPrintFunction, but this is not always + * available across all PortAudio versions (?) + */ +/*#define USE_PA_DEBUG_PRINT */ + struct pa_aud_factory { pjmedia_aud_dev_factory base; @@ -404,6 +409,7 @@ static int PaRecorderPlayerCallback( const void *input, return rc; } +#ifdef USE_PA_DEBUG_PRINT /* Logging callback from PA */ static void pa_log_cb(const char *log) { @@ -415,6 +421,7 @@ static void pa_log_cb(const char *log) */ typedef void (*PaUtilLogCallback ) (const char *log); void PaUtil_SetDebugPrintFunction(PaUtilLogCallback cb); +#endif /* @@ -442,7 +449,9 @@ static pj_status_t pa_init(pjmedia_aud_dev_factory *f) PJ_UNUSED_ARG(f); +#ifdef USE_PA_DEBUG_PRINT PaUtil_SetDebugPrintFunction(&pa_log_cb); +#endif err = Pa_Initialize(); |