Changeset 2506 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

Timestamp:

Mar 12, 2009 6:11:37 PM (14 years ago)

Author:

bennylp

Message:

(Major) Task #737 and #738: integration of APS-Direct and Audiodev from aps-direct branch to trunk.

Location:

pjproject/trunk

Files:

• . (modified) (1 prop)
• pjsip/src/pjsua-lib/pjsua_call.c (modified) (1 diff)

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

@@ -371 +371 @@
     PJSUA_LOCK();
 
-    /* Create sound port if none is instantiated */
-    if (pjsua_var.snd_port==NULL && pjsua_var.null_snd==NULL && 
-        !pjsua_var.no_snd) 
+    /* Create sound port if none is instantiated, to check if sound device
+     * can be used. But only do this with the conference bridge, as with 
+     * audio switchboard (i.e. APS-Direct), we can only open the sound 
+     * device once the correct format has been known
+     */
+    if (!pjsua_var.is_mswitch && pjsua_var.snd_port==NULL && 
+        pjsua_var.null_snd==NULL && !pjsua_var.no_snd) 
     {
         pj_status_t status;