Changeset 3440

Timestamp:

Mar 15, 2011 3:16:33 AM (14 years ago)

Author:

ming

Message:

Re #1204:

• Update audio device's list after refreshing the device.
• Fixed WMME macro.

Location:

pjproject/trunk/pjmedia/src/pjmedia-audiodev

Files:

• audiodev.c (modified) (6 diffs)
• wmme_dev.c (modified) (1 diff)

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

@@ -251 +251 @@
 
 /* Internal: init driver */
-static pj_status_t init_driver(unsigned drv_idx)
+static pj_status_t init_driver(unsigned drv_idx, pj_bool_t refresh)
 {
     struct driver *drv = &aud_subsys.drv[drv_idx];
@@ -258 +258 @@
     pj_status_t status;
 
-    /* Create the factory */
-    f = (*drv->create)(aud_subsys.pf);
-    if (!f)
-        return PJ_EUNKNOWN;
-
-    /* Call factory->init() */
-    status = f->op->init(f);
-    if (status != PJ_SUCCESS) {
-        f->op->destroy(f);
-        return status;
+    if (!refresh) {
+        /* Create the factory */
+        f = (*drv->create)(aud_subsys.pf);
+        if (!f)
+            return PJ_EUNKNOWN;
+
+        /* Call factory->init() */
+        status = f->op->init(f);
+        if (status != PJ_SUCCESS) {
+            f->op->destroy(f);
+            return status;
+        }
+    } else {
+        f = drv->f;
     }
 
@@ -408 +412 @@
     /* Initialize each factory and build the device ID list */
     for (i=0; i<aud_subsys.drv_cnt; ++i) {
-        status = init_driver(i);
+        status = init_driver(i, PJ_FALSE);
         if (status != PJ_SUCCESS) {
             deinit_driver(i);
@@ -428 +432 @@
 
     aud_subsys.drv[aud_subsys.drv_cnt].create = adf;
-    status = init_driver(aud_subsys.drv_cnt);
+    status = init_driver(aud_subsys.drv_cnt, PJ_FALSE);
     if (status == PJ_SUCCESS) {
         aud_subsys.drv_cnt++;
@@ -497 +501 @@
     unsigned i;
     
+    aud_subsys.dev_cnt = 0;
     for (i=0; i<aud_subsys.drv_cnt; ++i) {
         struct driver *drv = &aud_subsys.drv[i];
@@ -507 +512 @@
             }
         }
+        init_driver(i, PJ_TRUE);
     }
     return PJ_SUCCESS;

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

@@ -40 +40 @@
 
 #ifndef PJMEDIA_WMME_DEV_USE_MMDEVICE_API
-#   define PJMEDIAWMME_DEV_USE_MMDEVICE_API \
+#   define PJMEDIA_WMME_DEV_USE_MMDEVICE_API \
            (defined(_WIN32_WINNT) && (_WIN32_WINNT>=0x0600))
 #endif