diff options
| author | Benny Prijono <bennylp@teluu.com> | 2006-11-21 08:41:00 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2006-11-21 08:41:00 +0000 |
| commit | c0d24ae7ca8ca82621b174879dc11cdf0f5a499a (patch) | |
| tree | 921edeac4af84f31be27baf24909af5ceb57d3d0 | |
| parent | bc539d8b2acb98c02e1a67fb4b2d00ba4ba96c73 (diff) | |
Fixed sound device ID bug: application was unable to use device ID zero because this caused pasound.c to autodetect default device
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@812 74dad513-b988-da41-8d7b-12977e46ad98
| -rw-r--r-- | pjmedia/src/pjmedia/pasound.c | 8 | ||||
| -rw-r--r-- | pjsip/src/pjsua-lib/pjsua_core.c | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/pjmedia/src/pjmedia/pasound.c b/pjmedia/src/pjmedia/pasound.c index 388e410b..68c8c7e0 100644 --- a/pjmedia/src/pjmedia/pasound.c +++ b/pjmedia/src/pjmedia/pasound.c @@ -341,7 +341,7 @@ PJ_DEF(pj_status_t) pjmedia_snd_open_rec( int index, const PaStreamInfo *paSI; PaError err; - if (index <= 0) { + if (index < 0) { index = pa_get_default_input_dev(channel_count); if (index < 0) { /* No such device. */ @@ -437,7 +437,7 @@ PJ_DEF(pj_status_t) pjmedia_snd_open_player( int index, unsigned paFrames, paRate, paLatency; PaError err; - if (index <= 0) { + if (index < 0) { index = pa_get_default_output_dev(channel_count); if (index < 0) { /* No such device. */ @@ -542,7 +542,7 @@ PJ_DEF(pj_status_t) pjmedia_snd_open( int rec_id, unsigned paFrames, paRate, paInputLatency, paOutputLatency; PaError err; - if (rec_id <= 0) { + if (rec_id < 0) { rec_id = pa_get_default_input_dev(channel_count); if (rec_id < 0) { /* No such device. */ @@ -556,7 +556,7 @@ PJ_DEF(pj_status_t) pjmedia_snd_open( int rec_id, return PJMEDIA_ESNDINDEVID; } - if (play_id <= 0) { + if (play_id < 0) { play_id = pa_get_default_output_dev(channel_count); if (play_id < 0) { /* No such device. */ diff --git a/pjsip/src/pjsua-lib/pjsua_core.c b/pjsip/src/pjsua-lib/pjsua_core.c index 33db0666..000d469f 100644 --- a/pjsip/src/pjsua-lib/pjsua_core.c +++ b/pjsip/src/pjsua-lib/pjsua_core.c @@ -394,6 +394,9 @@ PJ_DEF(pj_status_t) pjsua_create(void) PJ_ASSERT_RETURN(status == PJ_SUCCESS, status); + /* Set default sound device ID */ + pjsua_var.cap_dev = pjsua_var.play_dev = -1; + /* Init caching pool. */ pj_caching_pool_init(&pjsua_var.cp, &pj_pool_factory_default_policy, 0); |