Changeset 1893

Timestamp:

Mar 25, 2008 5:05:59 PM (17 years ago)

Author:

bennylp

Message:

Ticket #516: Assertion in sound device when headset is plugged/unplugged in MacOS X (thanks Alexei Kuznetsov)

File:

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

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

@@ -70 +70 @@
 
     pj_bool_t            rec_thread_exited;
-    pj_bool_t            rec_thread_initialized;
+    //pj_bool_t          rec_thread_initialized;
     pj_thread_desc       rec_thread_desc;
     pj_thread_t         *rec_thread;
 
     pj_bool_t            play_thread_exited;
-    pj_bool_t            play_thread_initialized;
+    //pj_bool_t          play_thread_initialized;
     pj_thread_desc       play_thread_desc;
     pj_thread_t         *play_thread;
@@ -102 +102 @@
         return paContinue;
 
-    if (stream->rec_thread_initialized == 0) {
+    // Sometime the thread, where this callback called from, is changed
+    // (e.g: in MacOS this happens when plugging/unplugging headphone)
+    // if (stream->rec_thread_initialized == 0) {
+    if (!pj_thread_is_registered()) {
         status = pj_thread_register("pa_rec", stream->rec_thread_desc, 
                                     &stream->rec_thread);
-        stream->rec_thread_initialized = 1;
+        //stream->rec_thread_initialized = 1;
         PJ_LOG(5,(THIS_FILE, "Recorder thread started"));
     }
@@ -152 +155 @@
         return paContinue;
 
-    if (stream->play_thread_initialized == 0) {
+    // Sometime the thread, where this callback called from, is changed
+    // (e.g: in MacOS this happens when plugging/unplugging headphone)
+    // if (stream->play_thread_initialized == 0) {
+    if (!pj_thread_is_registered()) {
         status = pj_thread_register("portaudio", stream->play_thread_desc,
                                     &stream->play_thread);
-        stream->play_thread_initialized = 1;
+        //stream->play_thread_initialized = 1;
         PJ_LOG(5,(THIS_FILE, "Player thread started"));
     }