Changeset 2027 for pjproject/trunk

Timestamp:

Jun 16, 2008 9:52:50 AM (16 years ago)

Author:

nanang

Message:

More ticket #540: updated snd-auto-close to work friendly with call

Location:

pjproject/trunk/pjsip/src/pjsua-lib

Files:

• pjsua_call.c (modified) (1 diff)
• pjsua_media.c (modified) (6 diffs)

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

@@ -348 +348 @@
 
     PJSUA_LOCK();
+
+    /* Create sound port if none is instantiated */
+    if (pjsua_var.snd_port==NULL && pjsua_var.null_snd==NULL && 
+        !pjsua_var.no_snd) 
+    {
+        pj_status_t status;
+
+        status = pjsua_set_snd_dev(pjsua_var.cap_dev, pjsua_var.play_dev);
+        if (status != PJ_SUCCESS) {
+            PJSUA_UNLOCK();
+            return status;
+        }
+    }
 
     acc = &pjsua_var.acc[acc_id];

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

@@ -426 +426 @@
 }
 
+/* Check if sound device is idle. */
+static void check_snd_dev_idle()
+{
+
+    /* Activate sound device auto-close timer if sound device is idle.
+     * It is idle when there is no port connection in the bridge.
+     */
+    if ((pjsua_var.snd_port!=NULL || pjsua_var.null_snd!=NULL) && 
+        pjsua_var.snd_idle_timer.id == PJ_FALSE &&
+        pjmedia_conf_get_connect_count(pjsua_var.mconf) == 0 &&
+        pjsua_var.media_cfg.snd_auto_close_time >= 0)
+    {
+        pj_time_val delay;
+
+        delay.msec = 0;
+        delay.sec = pjsua_var.media_cfg.snd_auto_close_time;
+
+        pjsua_var.snd_idle_timer.id = PJ_TRUE;
+        pjsip_endpt_schedule_timer(pjsua_var.endpt, &pjsua_var.snd_idle_timer, 
+                                   &delay);
+    }
+}
+
+
 /* Timer callback to close sound device */
 static void close_snd_timer_cb( pj_timer_heap_t *th,
@@ -966 +990 @@
     if (call->conf_slot != PJSUA_INVALID_ID) {
         if (pjsua_var.mconf) {
-            pjmedia_conf_remove_port(pjsua_var.mconf, call->conf_slot);
+            pjsua_conf_remove_port(call->conf_slot);
         }
         call->conf_slot = PJSUA_INVALID_ID;
@@ -1326 +1350 @@
 PJ_DEF(pj_status_t) pjsua_conf_remove_port(pjsua_conf_port_id id)
 {
-    return pjmedia_conf_remove_port(pjsua_var.mconf, (unsigned)id);
+    pj_status_t status;
+
+    status = pjmedia_conf_remove_port(pjsua_var.mconf, (unsigned)id);
+    check_snd_dev_idle();
+
+    return status;
 }
 
@@ -1368 +1397 @@
 
     status = pjmedia_conf_disconnect_port(pjsua_var.mconf, source, sink);
-    if (status != PJ_SUCCESS)
-        return status;
-
-    /* If no port is connected, sound device must be idle. Activate sound 
-     * device auto-close timer.
-     */
-    if ((pjsua_var.snd_port!=NULL || pjsua_var.null_snd!=NULL) && 
-        pjsua_var.snd_idle_timer.id==PJ_FALSE &&
-        pjmedia_conf_get_connect_count(pjsua_var.mconf) == 0 &&
-        pjsua_var.media_cfg.snd_auto_close_time >= 0)
-    {
-        pj_time_val delay;
-
-        delay.msec = 0;
-        delay.sec = pjsua_var.media_cfg.snd_auto_close_time;
-
-        pjsua_var.snd_idle_timer.id = PJ_TRUE;
-        pjsip_endpt_schedule_timer(pjsua_var.endpt, &pjsua_var.snd_idle_timer, 
-                                   &delay);
-    }
+    check_snd_dev_idle();
 
     return status;
@@ -1649 +1659 @@
 
     if (pjsua_var.player[id].port) {
-        pjmedia_conf_remove_port(pjsua_var.mconf, 
-                                 pjsua_var.player[id].slot);
+        pjsua_conf_remove_port(pjsua_var.player[id].slot);
         pjmedia_port_destroy(pjsua_var.player[id].port);
         pjsua_var.player[id].port = NULL;
@@ -1825 +1834 @@
 
     if (pjsua_var.recorder[id].port) {
-        pjmedia_conf_remove_port(pjsua_var.mconf, 
-                                 pjsua_var.recorder[id].slot);
+        pjsua_conf_remove_port(pjsua_var.recorder[id].slot);
         pjmedia_port_destroy(pjsua_var.recorder[id].port);
         pjsua_var.recorder[id].port = NULL;