From 29b4bf964f79df6749ddfca114085df520589b3d Mon Sep 17 00:00:00 2001 From: Benny Prijono Date: Wed, 3 Jun 2009 12:29:35 +0000 Subject: Ticket #853: ./configure with --disable-sound argument does not work - when --disable-sound is specified, no sound factory will be created - modified audiodev.c to not return error when there's no device found - compilation error in pa_dev.c when it's disabled and include path is not set git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2740 74dad513-b988-da41-8d7b-12977e46ad98 --- pjmedia/build/os-auto.mak.in | 4 +--- pjmedia/src/pjmedia-audiodev/audiodev.c | 2 +- pjmedia/src/pjmedia-audiodev/pa_dev.c | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pjmedia/build/os-auto.mak.in b/pjmedia/build/os-auto.mak.in index 603d4971..5b80ea2d 100644 --- a/pjmedia/build/os-auto.mak.in +++ b/pjmedia/build/os-auto.mak.in @@ -102,9 +102,7 @@ endif # Null sound device # ifeq ($(AC_PJMEDIA_SND),null) -# ***** Error ****** -# This will not work either with the new Audiodev -export CFLAGS += -DPJMEDIA_SOUND_IMPLEMENTATION=PJMEDIA_SOUND_NULL_SOUND +export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 -DPJMEDIA_AUDIO_DEV_HAS_WMME=0 endif # diff --git a/pjmedia/src/pjmedia-audiodev/audiodev.c b/pjmedia/src/pjmedia-audiodev/audiodev.c index 21c4b3d2..fde54488 100644 --- a/pjmedia/src/pjmedia-audiodev/audiodev.c +++ b/pjmedia/src/pjmedia-audiodev/audiodev.c @@ -344,7 +344,7 @@ static void deinit_driver(unsigned drv_idx) PJ_DEF(pj_status_t) pjmedia_aud_subsys_init(pj_pool_factory *pf) { unsigned i; - pj_status_t status = PJ_ENOMEM; + pj_status_t status = PJ_SUCCESS; /* Allow init() to be called multiple times as long as there is matching * number of shutdown(). diff --git a/pjmedia/src/pjmedia-audiodev/pa_dev.c b/pjmedia/src/pjmedia-audiodev/pa_dev.c index 5644e1f1..53cca042 100644 --- a/pjmedia/src/pjmedia-audiodev/pa_dev.c +++ b/pjmedia/src/pjmedia-audiodev/pa_dev.c @@ -22,10 +22,10 @@ #include #include #include -#include #if PJMEDIA_AUDIO_DEV_HAS_PORTAUDIO +#include #define THIS_FILE "pa_dev.c" #define DRIVER_NAME "PA" -- cgit v1.2.3