diff options
| author | Benny Prijono <bennylp@teluu.com> | 2009-06-03 12:29:35 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2009-06-03 12:29:35 +0000 |
| commit | 29b4bf964f79df6749ddfca114085df520589b3d (patch) | |
| tree | b293efefeb96123e6622eac3ab755d0c94e7bb03 /pjmedia | |
| parent | e624bbc74a4fe5f21f1f7175297056357cac8971 (diff) | |
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
Diffstat (limited to 'pjmedia')
| -rw-r--r-- | pjmedia/build/os-auto.mak.in | 4 | ||||
| -rw-r--r-- | pjmedia/src/pjmedia-audiodev/audiodev.c | 2 | ||||
| -rw-r--r-- | 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 <pj/log.h> #include <pj/os.h> #include <pj/string.h> -#include <portaudio.h> #if PJMEDIA_AUDIO_DEV_HAS_PORTAUDIO +#include <portaudio.h> #define THIS_FILE "pa_dev.c" #define DRIVER_NAME "PA" |