Changeset 234

Timestamp:

Feb 26, 2006 9:21:26 PM (18 years ago)

Author:

bennylp

Message:

Fixed various crashes since mutex is introduced

File:

• pjproject/trunk/pjmedia/src/pjmedia/conference.c (modified) (4 diffs)

pjproject/trunk/pjmedia/src/pjmedia/conference.c

@@ -355 +355 @@
 
 
-/*
- * Suspend sound device
- */
-static void suspend_sound( pjmedia_conf *conf )
-{
-    if (conf->snd_rec)
-        pj_snd_stream_stop(conf->snd_rec);
-    if (conf->snd_player)
-        pj_snd_stream_stop(conf->snd_player);
-}
-
-
 /**
  * Destroy conference bridge.
@@ -374 +362 @@
     PJ_ASSERT_RETURN(conf != NULL, PJ_EINVAL);
 
-    suspend_sound(conf);
+    //suspend_sound(conf);
     destroy_sound(conf);
     pj_mutex_destroy(conf->mutex);
@@ -541 +529 @@
                   dst_port->name.ptr));
 
-        if (conf->connect_cnt == 0) {
-            suspend_sound(conf);
-            destroy_sound(conf);
-        }
+        
     }
 
     pj_mutex_unlock(conf->mutex);
+
+    if (conf->connect_cnt == 0) {
+        destroy_sound(conf);
+    }
 
     return PJ_SUCCESS;
@@ -606 +595 @@
     --conf->port_cnt;
 
+    pj_mutex_unlock(conf->mutex);
+
+
     /* Stop sound if there's no connection. */
     if (conf->connect_cnt == 0) {
         destroy_sound(conf);
     }
-
-    pj_mutex_unlock(conf->mutex);
 
     return PJ_SUCCESS;