Changeset 5677 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_aud.c

Timestamp:

Oct 27, 2017 6:30:50 AM (7 years ago)

Author:

ming

Message:

Fixed #2053: Update pjsua_get_snd_dev() info before calling on_snd_dev_operation() callback

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_aud.c (modified) (9 diffs)

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

@@ -24 +24 @@
 
 #define THIS_FILE               "pjsua_aud.c"
-#define NULL_SND_DEV_ID         -99
 
 /*****************************************************************************
@@ -881 +880 @@
 
         if (need_reopen) {
-            if (pjsua_var.cap_dev != NULL_SND_DEV_ID) {
+            if (pjsua_var.cap_dev != PJSUA_SND_NULL_DEV) {
                 pjmedia_snd_port_param param;
 
@@ -1728 +1727 @@
 
     /* Check if NULL sound device is used */
-    if (NULL_SND_DEV_ID==param->base.rec_id ||
-        NULL_SND_DEV_ID==param->base.play_id)
+    if (PJSUA_SND_NULL_DEV==param->base.rec_id ||
+        PJSUA_SND_NULL_DEV==param->base.play_id)
     {
         return pjsua_set_null_snd_dev();
@@ -1736 +1735 @@
     /* Close existing sound port */
     close_snd_dev();
+
+    /* Save the device IDs */
+    pjsua_var.cap_dev = param->base.rec_id;
+    pjsua_var.play_dev = param->base.play_id;
 
     /* Notify app */
@@ -1853 +1856 @@
     }
 
-    /* Save the device IDs */
-    pjsua_var.cap_dev = param->base.rec_id;
-    pjsua_var.play_dev = param->base.play_id;
-
     /* Update sound device name. */
     {
@@ -2010 +2009 @@
     
     /* Null-sound */
-    if (snd_param->capture_dev == NULL_SND_DEV_ID && 
-        snd_param->playback_dev == NULL_SND_DEV_ID) 
+    if (snd_param->capture_dev == PJSUA_SND_NULL_DEV && 
+        snd_param->playback_dev == PJSUA_SND_NULL_DEV) 
     {
         PJSUA_UNLOCK();
@@ -2130 +2129 @@
     close_snd_dev();
 
+    pjsua_var.cap_dev = PJSUA_SND_NULL_DEV;
+    pjsua_var.play_dev = PJSUA_SND_NULL_DEV;
+
     /* Notify app */
     if (pjsua_var.ua_cfg.cb.on_snd_dev_operation) {
@@ -2162 +2164 @@
     PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
 
-    pjsua_var.cap_dev = NULL_SND_DEV_ID;
-    pjsua_var.play_dev = NULL_SND_DEV_ID;
-
     pjsua_var.no_snd = PJ_FALSE;
     pjsua_var.snd_is_on = PJ_TRUE;
@@ -2185 +2184 @@
     close_snd_dev();
     pjsua_var.no_snd = PJ_TRUE;
+    pjsua_var.cap_dev = PJSUA_SND_NO_DEV;
+    pjsua_var.play_dev = PJSUA_SND_NO_DEV;
 
     PJSUA_UNLOCK();