diff options
| author | Benny Prijono <bennylp@teluu.com> | 2013-04-25 08:09:42 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2013-04-25 08:09:42 +0000 |
| commit | 3b3bb2503bd93b58ca2b1a59140fc1c0ada92148 (patch) | |
| tree | 779f0316557d65e1537713326c33827227787aa3 /pjmedia | |
| parent | cdf7e6d20dff7573a553f65e410ed1c631ce0832 (diff) | |
Re #1656: fixes to audio routing from latest suggestions
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4502 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia')
| -rw-r--r-- | pjmedia/src/pjmedia-audiodev/bb10_dev.c | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/pjmedia/src/pjmedia-audiodev/bb10_dev.c b/pjmedia/src/pjmedia-audiodev/bb10_dev.c index 5aaf1a24..b7a9a280 100644 --- a/pjmedia/src/pjmedia-audiodev/bb10_dev.c +++ b/pjmedia/src/pjmedia-audiodev/bb10_dev.c @@ -633,7 +633,7 @@ static pj_status_t bb10_initialize_playback_ctrl(struct bb10_stream *stream, if (stream->pb_ctrl_audio_manager_handle == 0) { /* lazy init an audio manager handle */ - ret = audio_manager_get_handle(AUDIO_TYPE_VIDEO_CHAT, 0, false, + ret = audio_manager_get_handle(AUDIO_TYPE_VOICE, 0, false, &stream->pb_ctrl_audio_manager_handle); if (ret != 0) { TRACE_((THIS_FILE, "audio_manager_get_handle ret = %d",ret)); @@ -646,33 +646,21 @@ static pj_status_t bb10_initialize_playback_ctrl(struct bb10_stream *stream, ret = audio_manager_set_handle_type( stream->pb_ctrl_audio_manager_handle, AUDIO_TYPE_VIDEO_CHAT, - AUDIO_DEVICE_SPEAKER, + AUDIO_DEVICE_DEFAULT, AUDIO_DEVICE_DEFAULT); } else { ret = audio_manager_set_handle_type( stream->pb_ctrl_audio_manager_handle, - AUDIO_TYPE_VIDEO_CHAT, - AUDIO_DEVICE_HANDSET, + AUDIO_TYPE_VOICE, + AUDIO_DEVICE_DEFAULT, AUDIO_DEVICE_DEFAULT); } - if (ret == 0) { - /* RIM recommend this call */ - ret = audio_manager_set_handle_routing_conditions( - stream->pb_ctrl_audio_manager_handle, - SETTINGS_RESET_ON_DEVICE_CONNECTION); - if (ret != 0) { - TRACE_((THIS_FILE, - "audio_manager_set_handle_routing_conditions ret = %d", - ret)); - return PJMEDIA_EAUD_SYSERR; - } - } else { - TRACE_((THIS_FILE, "audio_manager_set_handle_type ret = %d", ret)); - return PJMEDIA_EAUD_SYSERR; + if (ret != 0) { + return PJMEDIA_EAUD_SYSERR; + }else{ + return PJ_SUCCESS; } - - return PJ_SUCCESS; } static int32_t get_alsa_pcm_fmt(const pjmedia_aud_param *param) |