Changeset 9916 for trunk/src

Timestamp:

Mar 6, 2003, 4:42:33 PM (22 years ago)

Author:

sandervl

Message:

Improved accuracy of waveIn/OutGetPosition. (use FPU to prevent rounding errors)

Location:

trunk/src/winmm

Files:

• os2timer.cpp (modified) (5 diffs)
• waveout.cpp (modified) (2 diffs)
• waveoutdart.cpp (modified) (3 diffs)

trunk/src/winmm/os2timer.cpp

@@ -1 @@
-/* $Id: os2timer.cpp,v 1.20 2003-03-05 14:49:03 sandervl Exp $ */
+/* $Id: os2timer.cpp,v 1.21 2003-03-06 15:42:33 sandervl Exp $ */
 
 /*
@@ -67 +67 @@
   : next(NULL)
 {
-  dprintf(("WINMM:OS2Timer: OS2TimerResolution::OS2TimerResolution(%08xh,%08xh)\n",
+  dprintf2(("WINMM:OS2Timer: OS2TimerResolution::OS2TimerResolution(%08xh,%08xh)\n",
            this,
            dwPeriod));
@@ -106 +106 @@
 OS2TimerResolution::~OS2TimerResolution()
 {
-  dprintf(("WINMM:OS2Timer: OS2TimerResolution::~OS2TimerResolution(%08xh)\n",
+  dprintf2(("WINMM:OS2Timer: OS2TimerResolution::~OS2TimerResolution(%08xh)\n",
            this));
 
@@ -146 +146 @@
 BOOL OS2TimerResolution::enterResolutionScope(int dwPeriod)
 {
-  dprintf(("WINMM:OS2Timer: OS2TimerResolution::enterResolutionScope(%08xh)\n",
+  dprintf2(("WINMM:OS2Timer: OS2TimerResolution::enterResolutionScope(%08xh)\n",
            dwPeriod));
 
@@ -171 +171 @@
 BOOL OS2TimerResolution::leaveResolutionScope(int dwPeriod)
 {
-  dprintf(("WINMM:OS2Timer: OS2TimerResolution::leaveResolutionScope(%08xh)\n",
+  dprintf2(("WINMM:OS2Timer: OS2TimerResolution::leaveResolutionScope(%08xh)\n",
            dwPeriod));
 

trunk/src/winmm/waveout.cpp

@@ -1 @@
-/* $Id: waveout.cpp,v 1.25 2002-06-04 17:36:55 sandervl Exp $ */
+/* $Id: waveout.cpp,v 1.26 2003-03-06 15:42:33 sandervl Exp $ */
 //#undef DEBUG
 /*
@@ -85 +85 @@
     if(WaveOut::find(dwave) == TRUE)
     {
-        if(!(pwh->dwFlags & WHDR_PREPARED) || pwh->lpData == NULL)
+        if(!(pwh->dwFlags & WHDR_PREPARED) || pwh->lpData == NULL) {
+            dprintf(("waveOutWrite: WAVERR_UNPREPARED!!"));
             return WAVERR_UNPREPARED;
-
-        if(pwh->dwFlags & WHDR_INQUEUE)
+        }
+        if(pwh->dwFlags & WHDR_INQUEUE) {
+            dprintf(("waveOutWrite: WAVERR_STILLPLAYING!!"));
             return WAVERR_STILLPLAYING;
-
+        }
         pwh->dwFlags |= WHDR_INQUEUE;
         pwh->dwFlags &= ~WHDR_DONE;

trunk/src/winmm/waveoutdart.cpp

@@ -1 @@
-/* $Id: waveoutdart.cpp,v 1.18 2003-03-05 16:45:10 sandervl Exp $ */
+/* $Id: waveoutdart.cpp,v 1.19 2003-03-06 15:42:33 sandervl Exp $ */
 
 /*
@@ -297 +297 @@
             WAVEHDR *chdr = wavehdr;
             while(chdr->lpNext) {
+#ifdef DEBUG
+                if(chdr == pwh) dprintf(("adding already present buffer!!!!!"));
+#endif
                 chdr = chdr->lpNext;
             }
@@ -478 +481 @@
     rc = mymciSendCommand(DeviceId, MCI_STATUS, MCI_STATUS_ITEM|MCI_WAIT, (PVOID)&mciStatus, 0);
     if((rc & 0xFFFF) == MCIERR_SUCCESS) {
-        nrbytes = (mciStatus.ulReturn * (getAvgBytesPerSecond()/1000));
+        nrbytes = (ULONG)((double)mciStatus.ulReturn * ((double)getAvgBytesPerSecond()/1000.0));
         return nrbytes;;
     }