Changeset 4145 for pjproject/trunk

Timestamp:

May 22, 2012 11:13:22 PM (12 years ago)

Author:

bennylp

Message:

Fixed #1515: Sound device is not closed when the call fails to connect (thanks Régis Montoya for the report)

Location:

pjproject/trunk/pjsip

Files:

• include/pjsua-lib/pjsua_internal.h (modified) (1 diff)
• src/pjsua-lib/pjsua_aud.c (modified) (5 diffs)
• src/pjsua-lib/pjsua_call.c (modified) (1 diff)

pjproject/trunk/pjsip/include/pjsua-lib/pjsua_internal.h

@@ -770 +770 @@
                                      const pjmedia_sdp_session *local_sdp,
                                      const pjmedia_sdp_session *remote_sdp);
+void pjsua_check_snd_dev_idle();
 
 /*

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

@@ -378 +378 @@
 
 /* Check if sound device is idle. */
-static void check_snd_dev_idle()
+void pjsua_check_snd_dev_idle()
 {
     unsigned call_cnt;
@@ -440 +440 @@
     PJSUA_LOCK();
     if (entry->id) {
-        PJ_LOG(4,(THIS_FILE,"Closing sound device after idle for %d seconds",
+        PJ_LOG(4,(THIS_FILE,"Closing sound device after idle for %d second(s)",
                   pjsua_var.media_cfg.snd_auto_close_time));
 
@@ -533 +533 @@
     }
 
-    check_snd_dev_idle();
+    pjsua_check_snd_dev_idle();
 }
 
@@ -792 +792 @@
 
     status = pjmedia_conf_remove_port(pjsua_var.mconf, (unsigned)id);
-    check_snd_dev_idle();
+    pjsua_check_snd_dev_idle();
 
     return status;
@@ -958 +958 @@
 
     status = pjmedia_conf_disconnect_port(pjsua_var.mconf, source, sink);
-    check_snd_dev_idle();
+    pjsua_check_snd_dev_idle();
 
     pj_log_pop_indent();

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

@@ -3129 +3129 @@
         reset_call(call->index);
 
+        pjsua_check_snd_dev_idle();
+
         PJSUA_UNLOCK();
     }