Changeset 4502 for pjproject

Timestamp:

Apr 25, 2013 8:09:42 AM (12 years ago)

Author:

bennylp

Message:

Re #1656: fixes to audio routing from latest suggestions

File:

• pjproject/trunk/pjmedia/src/pjmedia-audiodev/bb10_dev.c (modified) (2 diffs)

pjproject/trunk/pjmedia/src/pjmedia-audiodev/bb10_dev.c

@@ -634 +634 @@
     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) {
@@ -647 +647 @@
                 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;
-    }
-
-    return PJ_SUCCESS;
+    if (ret != 0) {
+        return PJMEDIA_EAUD_SYSERR;
+    }else{
+        return PJ_SUCCESS;
+    }
 }