Changeset 2366 for pjproject/trunk

Timestamp:

Nov 12, 2008 10:48:05 AM (16 years ago)

Author:

nanang

Message:

Fixed bug of unresetted static var dev_info that caused device name gets repeated on second call or soon of snd_init() (thanks Steven Back for the report).

File:

• pjproject/trunk/pjmedia/src/pjmedia/wmme_sound.c (modified) (3 diffs)

pjproject/trunk/pjmedia/src/pjmedia/wmme_sound.c

@@ -41 +41 @@
 static unsigned dev_count;
 static struct wmme_dev_info dev_info[MAX_HARDWARE];
-static int snd_init_count;
+static pj_bool_t snd_initialized = PJ_FALSE;
 
 /* Latency settings */
@@ -484 +484 @@
     int inputDeviceCount, outputDeviceCount, maximumPossibleDeviceCount;
 
-    if (++snd_init_count != 1)
+    if (snd_initialized)
         return PJ_SUCCESS;
+
+    pj_bzero(&dev_info, sizeof(dev_info));
 
     dev_count = 0;
@@ -618 +620 @@
 PJ_DEF(pj_status_t) pjmedia_snd_deinit(void)
 {
-    --snd_init_count;
+    snd_initialized = PJ_FALSE;
     return PJ_SUCCESS;
 }