Changeset 470 for pjproject/trunk

Timestamp:

May 22, 2006 10:47:33 AM (19 years ago)

Author:

bennylp

Message:

Fixed crash bug in DSound closing procedure

File:

• pjproject/trunk/pjmedia/src/pjmedia/dsound.c (modified) (2 diffs)

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

@@ -883 +883 @@
     pjmedia_snd_stream_stop(stream);
 
-    if (stream->play_strm.ds.play.lpDsBuffer) {
-        IDirectSoundBuffer_Release( stream->play_strm.ds.play.lpDsBuffer );
-        stream->play_strm.ds.play.lpDsBuffer = NULL;
-    }
-
-    if (stream->play_strm.ds.play.lpDs) {
-        IDirectSound_Release( stream->play_strm.ds.play.lpDs );
-        stream->play_strm.ds.play.lpDs = NULL;
-    }
-
-    if (stream->play_strm.lpDsNotify) {
-        //No need?
-        //IDirectSoundNotify_Release( stream->play_strm.lpDsNotify );
-        stream->play_strm.lpDsNotify = NULL;
-    }
-    
-    if (stream->play_strm.hEvent) {
-        CloseHandle(stream->play_strm.hEvent);
-        stream->play_strm.hEvent = NULL;
-    }
-
-
-    if (stream->rec_strm.ds.capture.lpDsBuffer) {
-        IDirectSoundCaptureBuffer_Release( stream->rec_strm.ds.capture.lpDsBuffer );
-        stream->rec_strm.ds.capture.lpDsBuffer = NULL;
-    }
-
-    if (stream->rec_strm.ds.capture.lpDs) {
-        IDirectSoundCapture_Release( stream->rec_strm.ds.capture.lpDs );
-        stream->rec_strm.ds.capture.lpDs = NULL;
-    }
-
-    if (stream->rec_strm.lpDsNotify) {
-        //No need?
-        //IDirectSoundNotify_Release( stream->rec_strm.lpDsNotify );
-        stream->rec_strm.lpDsNotify = NULL;
-    }
-    
-    if (stream->rec_strm.hEvent) {
-        CloseHandle(stream->rec_strm.hEvent);
-        stream->rec_strm.hEvent = NULL;
-    }
-
     if (stream->thread) {
         stream->thread_quit_flag = 1;
@@ -933 +890 @@
     }
 
+    if (stream->play_strm.lpDsNotify) {
+        IDirectSoundNotify_Release( stream->play_strm.lpDsNotify );
+        stream->play_strm.lpDsNotify = NULL;
+    }
+    
+    if (stream->play_strm.hEvent) {
+        CloseHandle(stream->play_strm.hEvent);
+        stream->play_strm.hEvent = NULL;
+    }
+
+    if (stream->play_strm.ds.play.lpDsBuffer) {
+        IDirectSoundBuffer_Release( stream->play_strm.ds.play.lpDsBuffer );
+        stream->play_strm.ds.play.lpDsBuffer = NULL;
+    }
+
+    if (stream->play_strm.ds.play.lpDs) {
+        IDirectSound_Release( stream->play_strm.ds.play.lpDs );
+        stream->play_strm.ds.play.lpDs = NULL;
+    }
+
+    if (stream->rec_strm.lpDsNotify) {
+        IDirectSoundNotify_Release( stream->rec_strm.lpDsNotify );
+        stream->rec_strm.lpDsNotify = NULL;
+    }
+    
+    if (stream->rec_strm.hEvent) {
+        CloseHandle(stream->rec_strm.hEvent);
+        stream->rec_strm.hEvent = NULL;
+    }
+
+    if (stream->rec_strm.ds.capture.lpDsBuffer) {
+        IDirectSoundCaptureBuffer_Release( stream->rec_strm.ds.capture.lpDsBuffer );
+        stream->rec_strm.ds.capture.lpDsBuffer = NULL;
+    }
+
+    if (stream->rec_strm.ds.capture.lpDs) {
+        IDirectSoundCapture_Release( stream->rec_strm.ds.capture.lpDs );
+        stream->rec_strm.ds.capture.lpDs = NULL;
+    }
+
+
     pj_pool_release(stream->pool);