Changeset 2971 for trunk/src

Timestamp:

Mar 2, 2000, 3:51:16 PM (25 years ago)

Author:

sandervl

Message:

fix for getPosition (overflow)

Location:

trunk/src/winmm

Files:

• dwaveout.cpp (modified) (3 diffs)
• waveout.cpp (modified) (2 diffs)

trunk/src/winmm/dwaveout.cpp

@@ -1 @@
-/* $Id: dwaveout.cpp,v 1.15 2000-02-27 20:29:46 sandervl Exp $ */
+/* $Id: dwaveout.cpp,v 1.16 2000-03-02 14:51:15 sandervl Exp $ */
 
 /*
@@ -145 +145 @@
    ulBufSize       = DART_BUFSIZE;
 
+   dprintf(("waveOutOpen: samplerate %d, numChan %d bps %d, format %x", SampleRate, nChannels, BitsPerSample, pwfx->wFormatTag));
    // Setup the open structure, pass the playlist and tell MCI_OPEN to use it
    memset(&AmpOpenParms,0,sizeof(AmpOpenParms));
@@ -531 +532 @@
     rc = mciSendCommand(DeviceId, MCI_STATUS, MCI_STATUS_ITEM|MCI_WAIT, (PVOID)&mciStatus, 0);
     if((rc & 0xFFFF) == MCIERR_SUCCESS) {
-        nrbytes = (mciStatus.ulReturn * getAvgBytesPerSecond())/1000;
+        nrbytes = (mciStatus.ulReturn * (getAvgBytesPerSecond()/1000));
         return nrbytes;;
     }

trunk/src/winmm/waveout.cpp

@@ -1 @@
-/* $Id: waveout.cpp,v 1.11 2000-02-27 20:29:47 sandervl Exp $ */
+/* $Id: waveout.cpp,v 1.12 2000-03-02 14:51:16 sandervl Exp $ */
 //#undef DEBUG
 /*
@@ -109 +109 @@
         pwh->dwFlags &= ~WHDR_DONE;
 
+         dprintf(("waveOutWrite %x %d %x", pwh->lpData, pwh->dwBufferLength, pwh->dwFlags));
         return(dwave->write(pwh, cbwh));
   }