Changeset 4879 for pjproject/trunk/pjmedia/src/pjmedia-audiodev/audiodev.c

Timestamp:

Jul 16, 2014 4:21:54 AM (10 years ago)

Author:

nanang

Message:

Fix #1777: Problem in audio device list refresh after unregistering an audio device factory.

File:

• pjproject/trunk/pjmedia/src/pjmedia-audiodev/audiodev.c (modified) (5 diffs)

pjproject/trunk/pjmedia/src/pjmedia-audiodev/audiodev.c

@@ -276 +276 @@
     pj_status_t status;
 
-    if (!refresh) {
+    if (!refresh && drv->create) {
         /* Create the factory */
         f = (*drv->create)(aud_subsys.pf);
@@ -291 +291 @@
         f = drv->f;
     }
+
+    if (!f)
+        return PJ_EUNKNOWN;
 
     /* Get number of devices */
@@ -312 +315 @@
 
     /* Fill in default devices */
-    drv->play_dev_idx = drv->rec_dev_idx = drv->dev_idx = -1;
+    drv->play_dev_idx = drv->rec_dev_idx =
+                        drv->dev_idx = PJMEDIA_AUD_INVALID_DEV;
     for (i=0; i<dev_cnt; ++i) {
         pjmedia_aud_dev_info info;
@@ -375 +379 @@
     }
 
-    drv->dev_cnt = 0;
-    drv->play_dev_idx = drv->rec_dev_idx = drv->dev_idx = -1;
+    pj_bzero(drv, sizeof(*drv));
+    drv->play_dev_idx = drv->rec_dev_idx = 
+                        drv->dev_idx = PJMEDIA_AUD_INVALID_DEV;
 }
 
@@ -492 +497 @@
 
             deinit_driver(i);
-            pj_bzero(drv, sizeof(*drv));
             return PJ_SUCCESS;
         }