Changeset 9671 for trunk/src/winmm/waveinoutbase.cpp

Timestamp:

Jan 14, 2003, 8:38:38 PM (23 years ago)

Author:

sandervl

Message:

Delete all wave object on unload; fix linked list synchronization

File:

• trunk/src/winmm/waveinoutbase.cpp (modified) (8 diffs)

trunk/src/winmm/waveinoutbase.cpp

@@ -1 @@
-/* $Id: waveinoutbase.cpp,v 1.4 2002-04-07 14:36:31 sandervl Exp $ */
+/* $Id: waveinoutbase.cpp,v 1.5 2003-01-14 19:38:38 sandervl Exp $ */
 
 /*
@@ -35 +35 @@
 #include "dbglocal.h"
 
+VMutex wavemutex;
 
 /******************************************************************************/
@@ -55 +56 @@
     State    = STATE_STOPPED;
 
-    wmutex.enter();
+    wavemutex.enter();
 
-    if(wave == NULL) {
-        wave = this;
+    if(head == NULL) {
+        head = this;
     }
     else {
-        WaveInOut *dwave = wave;
+        WaveInOut *dwave = head;
 
         while(dwave->next) {
@@ -68 +69 @@
         dwave->next = this;
     }
-    wmutex.leave();
+    wavemutex.leave();
 
     this->fdwOpen = fdwOpen;
@@ -78 +79 @@
 WaveInOut::~WaveInOut()
 {
-    wmutex.enter();
+    wavemutex.enter();
 
     State = STATE_STOPPED;
 
-    if(wave == this) {
-        wave = this->next;
+    if(head == this) {
+        head = this->next;
     }
     else {
-        WaveInOut *dwave = wave;
+        WaveInOut *dwave = head;
 
         while(dwave->next != this) {
@@ -93 +94 @@
         dwave->next = this->next;
     }
-    wmutex.leave();
+    wavemutex.leave();
 }
 /******************************************************************************/
@@ -146 +147 @@
 }
 /******************************************************************************/
+//Delete all active wave objects
+/******************************************************************************/
+void WaveInOut::shutdown()
+{
+    dprintf(("WaveInOut::shutdown"));
+    wavemutex.enter();
+    while(head) {
+        delete head;
+    }
+    wavemutex.leave();
+    dprintf(("WaveInOut::shutdown end"));
+}
+/******************************************************************************/
 /******************************************************************************/
 BOOL WaveInOut::find(WaveInOut *dwave)
 {
- WaveInOut *curwave = wave;
+    wavemutex.enter();
+
+    WaveInOut *curwave = head;
 
     while(curwave) {
         if(dwave == curwave) {
+            wavemutex.leave();
             return(TRUE);
         }
         curwave = curwave->next;
     }
+    wavemutex.leave();
 
     dprintf2(("WINMM:WaveInOut not found!\n"));
@@ -163 +181 @@
 /******************************************************************************/
 /******************************************************************************/
-WaveInOut *WaveInOut::wave = NULL;
+WaveInOut *WaveInOut::head = NULL;