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

Timestamp:

Apr 29, 2006 8:31:09 AM (18 years ago)

Author:

bennylp

Message:

Improve codec handling in pjsua cmd-line options, and add URI to call

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c (modified) (2 diffs)

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

@@ -1048 +1048 @@
                                    call->conf_slot, 0);
 
-    } else if (pjsua.auto_loop && call->inv->role == PJSIP_ROLE_UAS) {
+    }
+    if (pjsua.auto_loop && call->inv->role == PJSIP_ROLE_UAS) {
 
         pjmedia_conf_connect_port( pjsua.mconf, call->conf_slot, 
                                    call->conf_slot, 0);
 
-    } else if (pjsua.auto_conf) {
-
+    }
+    if (pjsua.auto_conf) {
         int i;
 
@@ -1071 +1072 @@
         }
 
-    } else {
-
-        /* Connect new call to the sound device port (port zero) in the
-         * main conference bridge.
-         */
+    } 
+    
+    /* Normal operation: if no auto_xx is given, connect new call to 
+     * the sound device port (port zero) in the main conference bridge.
+     */
+    if (pjsua.auto_play == 0 && pjsua.auto_loop == 0 &&
+        pjsua.auto_conf == 0)
+    {
         pjmedia_conf_connect_port( pjsua.mconf, 0, call->conf_slot, 0);
         pjmedia_conf_connect_port( pjsua.mconf, call->conf_slot, 0, 0);