Changeset 3632 for pjproject/branches/projects/2.0-dev/pjsip/src/pjsua-lib/pjsua_media.c

Timestamp:

Jul 13, 2011 3:05:22 AM (13 years ago)

Author:

bennylp

Message:

Fixed #1299: New callback to notify that sound device needs to be opened or closed

File:

• pjproject/branches/projects/2.0-dev/pjsip/src/pjsua-lib/pjsua_media.c (modified) (9 diffs)

pjproject/branches/projects/2.0-dev/pjsip/src/pjsua-lib/pjsua_media.c

@@ -377 +377 @@
      * It is idle when there is no port connection in the bridge and
      * there is no active call.
+     *
+     * Note: this block is now valid if no snd dev is used because of #1299
      */
-    if ((pjsua_var.snd_port!=NULL || pjsua_var.null_snd!=NULL) &&
+    if ((pjsua_var.snd_port!=NULL || pjsua_var.null_snd!=NULL ||
+            pjsua_var.no_snd) &&
         pjsua_var.snd_idle_timer.id == PJ_FALSE &&
         pjmedia_conf_get_connect_count(pjsua_var.mconf) == 0 &&
@@ -2422 +2425 @@
                 }
             }
+        } else if (pjsua_var.no_snd) {
+            if (!pjsua_var.snd_is_on) {
+                pjsua_var.snd_is_on = PJ_TRUE;
+                /* Notify app */
+                if (pjsua_var.ua_cfg.cb.on_snd_dev_operation) {
+                    (*pjsua_var.ua_cfg.cb.on_snd_dev_operation)(1);
+                }
+            }
         }
 
@@ -2438 +2449 @@
                 return status;
             }
-        }
-
+        } else if (pjsua_var.no_snd && !pjsua_var.snd_is_on) {
+            pjsua_var.snd_is_on = PJ_TRUE;
+            /* Notify app */
+            if (pjsua_var.ua_cfg.cb.on_snd_dev_operation) {
+                (*pjsua_var.ua_cfg.cb.on_snd_dev_operation)(1);
+            }
+        }
     }
 
@@ -3093 +3109 @@
     /* Close existing sound port */
     close_snd_dev();
+
+    /* Notify app */
+    if (pjsua_var.ua_cfg.cb.on_snd_dev_operation) {
+        (*pjsua_var.ua_cfg.cb.on_snd_dev_operation)(1);
+    }
 
     /* Create memory pool for sound device. */
@@ -3230 +3251 @@
 static void close_snd_dev(void)
 {
+    /* Notify app */
+    if (pjsua_var.snd_is_on && pjsua_var.ua_cfg.cb.on_snd_dev_operation) {
+        (*pjsua_var.ua_cfg.cb.on_snd_dev_operation)(0);
+    }
+
     /* Close sound device */
     if (pjsua_var.snd_port) {
@@ -3263 +3289 @@
         pj_pool_release(pjsua_var.snd_pool);
     pjsua_var.snd_pool = NULL;
+    pjsua_var.snd_is_on = PJ_FALSE;
 }
 
@@ -3325 +3352 @@
 
     pjsua_var.no_snd = PJ_FALSE;
+    pjsua_var.snd_is_on = PJ_TRUE;
 
     return PJ_SUCCESS;
@@ -3359 +3387 @@
     /* Close existing sound device */
     close_snd_dev();
+
+    /* Notify app */
+    if (pjsua_var.ua_cfg.cb.on_snd_dev_operation) {
+        (*pjsua_var.ua_cfg.cb.on_snd_dev_operation)(1);
+    }
 
     /* Create memory pool for sound device. */
@@ -3389 +3422 @@
 
     pjsua_var.no_snd = PJ_FALSE;
+    pjsua_var.snd_is_on = PJ_TRUE;
 
     return PJ_SUCCESS;