Changeset 1041

Timestamp:

Mar 5, 2007 1:13:22 PM (17 years ago)

Author:

bennylp

Message:

Allow pjmedia_snd_init()/deinit() to be called more than once

Location:

pjproject/trunk/pjmedia/src/pjmedia

Files:

• dsound.c (modified) (3 diffs)
• pasound.c (modified) (3 diffs)

pjproject/trunk/pjmedia/src/pjmedia/dsound.c

@@ -57 +57 @@
 static unsigned dev_count;
 static struct dsound_dev_info dev_info[MAX_HARDWARE];
-
+static int snd_init_count;
 
 
@@ -638 +638 @@
     unsigned i;
 
+    if (++snd_init_count != 1)
+        return PJ_SUCCESS;
+
     pool_factory = factory;
 
@@ -667 +670 @@
 PJ_DEF(pj_status_t) pjmedia_snd_deinit(void)
 {
+    --snd_init_count;
     return PJ_SUCCESS;
 }

pjproject/trunk/pjmedia/src/pjmedia/pasound.c

@@ -29 +29 @@
 #define THIS_FILE       "pasound.c"
 
+static int snd_init_count;
+
 static struct snd_mgr
 {
@@ -194 +196 @@
 PJ_DEF(pj_status_t) pjmedia_snd_init(pj_pool_factory *factory)
 {
-    int err;
-
-    snd_mgr.factory = factory;
-    err = Pa_Initialize();
-
-    PJ_LOG(4,(THIS_FILE, "PortAudio sound library initialized, status=%d", err));
-    PJ_LOG(4,(THIS_FILE, "PortAudio host api count=%d",
-                         Pa_GetHostApiCount()));
-    PJ_LOG(4,(THIS_FILE, "Sound device count=%d",
-                         pjmedia_snd_get_dev_count()));
-
-    return err ? PJMEDIA_ERRNO_FROM_PORTAUDIO(err) : PJ_SUCCESS;
+    if (++snd_init_count == 1) {
+        int err;
+
+        snd_mgr.factory = factory;
+        err = Pa_Initialize();
+
+        PJ_LOG(4,(THIS_FILE, 
+                  "PortAudio sound library initialized, status=%d", err));
+        PJ_LOG(4,(THIS_FILE, "PortAudio host api count=%d",
+                             Pa_GetHostApiCount()));
+        PJ_LOG(4,(THIS_FILE, "Sound device count=%d",
+                             pjmedia_snd_get_dev_count()));
+
+        return err ? PJMEDIA_ERRNO_FROM_PORTAUDIO(err) : PJ_SUCCESS;
+    } else {
+        return PJ_SUCCESS;
+    }
 }
 
@@ -805 +812 @@
 PJ_DEF(pj_status_t) pjmedia_snd_deinit(void)
 {
-    int err;
-
-    PJ_LOG(4,(THIS_FILE, "PortAudio sound library shutting down.."));
-
-    err = Pa_Terminate();
-
-    return err ? PJMEDIA_ERRNO_FROM_PORTAUDIO(err) : PJ_SUCCESS;
+    if (--snd_init_count == 0) {
+        int err;
+
+        PJ_LOG(4,(THIS_FILE, "PortAudio sound library shutting down.."));
+
+        err = Pa_Terminate();
+
+        return err ? PJMEDIA_ERRNO_FROM_PORTAUDIO(err) : PJ_SUCCESS;
+    } else {
+        return PJ_SUCCESS;
+    }
 }