Changeset 9902 for trunk/src/winmm/os2timer.cpp

Timestamp:

Mar 5, 2003, 3:49:04 PM (22 years ago)

Author:

sandervl

Message:

waveoutGetPosition: return 0 if stream is not active (DART); waveinGetPosition: return 0 if stream is not active (DART); Don't print a warning for CALLBACK_NULL callbacks; Added ODIN_waveInSetFixedBuffers, renamed SetFixedWaveBufferSize to ODIN_waveOutSetFixedBuffers. Used to tell WINMM to use the waveOutWrite buffer size for the DART buffers

File:

• trunk/src/winmm/os2timer.cpp (modified) (15 diffs)

trunk/src/winmm/os2timer.cpp

@@ -1 @@
-/* $Id: os2timer.cpp,v 1.19 2001-10-03 13:47:58 sandervl Exp $ */
+/* $Id: os2timer.cpp,v 1.20 2003-03-05 14:49:03 sandervl Exp $ */
 
 /*
@@ -24 +24 @@
 #include <win32api.h>
 #include <wprocess.h>
-#include <misc.h>
+#include <dbglog.h>
+#include <vmutex.h>
 
 #include "time.h"
@@ -36 +37 @@
  * Structures                                                               *
  ****************************************************************************/
-  
+static VMutex timeMutex;
 
 /****************************************************************************
@@ -70 +71 @@
            dwPeriod));
 
+  timeMutex.enter();
   // add to linked list
   OS2TimerResolution *timeRes = OS2TimerResolution::sTimerResolutions;
@@ -83 +85 @@
   else
     OS2TimerResolution::sTimerResolutions = this;
+
+  timeMutex.leave();
 
   this->dwPeriod = dwPeriod;
@@ -106 +110 @@
 
 
+  timeMutex.enter();
+
   // remove from linked list
   OS2TimerResolution *timeRes = OS2TimerResolution::sTimerResolutions;
@@ -121 +127 @@
   else
     OS2TimerResolution::sTimerResolutions = timeRes->next;
+
+  timeMutex.leave();
 }
 
@@ -166 +174 @@
            dwPeriod));
 
+  timeMutex.enter();
   OS2TimerResolution* timeRes = OS2TimerResolution::sTimerResolutions;
 
@@ -178 +187 @@
     {
       delete timeRes;              // so delete that object
+      timeMutex.leave();
       return TRUE;                 // OK, can remove the entry
     }
  }
+ timeMutex.leave();
+
  return FALSE;                     // nope, mismatch !
 }
@@ -199 +211 @@
 int OS2TimerResolution::queryCurrentResolution()
 {
+  timeMutex.enter();
   OS2TimerResolution *timeRes = OS2TimerResolution::sTimerResolutions;
   int                iMin = -1;
@@ -210 +223 @@
         iMin = timeRes->dwPeriod;
     }
+  timeMutex.leave();
 
   dprintf(("WINMM:OS2Timer: OS2TimerResolution::queryCurrentResolution == %08xh\n",
@@ -230 +244 @@
            this));
 
+  timeMutex.enter();
   OS2Timer *timer = OS2Timer::timers;
 
@@ -242 +257 @@
   else
     timers = this;
+  timeMutex.leave();
   
   // create timer semaphore
@@ -274 +290 @@
            this));
 
+  KillTimer();
+
+  timeMutex.enter();
   OS2Timer *timer = OS2Timer::timers;
 
-  KillTimer();
-
   if(timer != this)
   {
@@ -288 +305 @@
   else
     timers = timer->next;
+
+  timeMutex.leave();
 }
 /******************************************************************************/