Changeset 3047 for trunk/src/dsound

Timestamp:

Mar 8, 2000, 9:44:09 PM (26 years ago)

Author:

mike

Message:

Fixed Moorhuhn

Location:

trunk/src/dsound/new

Files:

• OS2SNDBUFFER.CPP (modified) (5 diffs)
• OS2SNDBUFFER.H (modified) (2 diffs)

trunk/src/dsound/new/OS2SNDBUFFER.CPP

@@ -1 @@
-/* $Id: OS2SNDBUFFER.CPP,v 1.2 2000-03-08 18:26:47 mike Exp $ */
+/* $Id: OS2SNDBUFFER.CPP,v 1.3 2000-03-08 20:44:09 mike Exp $ */
 
 /*
@@ -414 +414 @@
    OS2IDirectSoundBuffer *me = (OS2IDirectSoundBuffer *)This;
 
-   dprintf(("DSOUND-OS2IDirectSoundBuffer::SoundBufLock (buf=%X, %d bytes)", me, dwWriteBytes));
+   dprintf(("DSOUND-OS2IDirectSoundBuffer::SoundBufLock (buf=%X, %d bytes of %d)", me, dwWriteBytes, me->bufferdesc.dwBufferBytes));
    if (me == NULL || !lplpvAudioPtr1 || !lpdwAudioBytes1)
       return DSERR_INVALIDPARAM;
@@ -462 +462 @@
    }
 
-   me->frac     = 0;
-   me->fPlaying = TRUE;
-   me->status   = DSBSTATUS_PLAYING;
-   me->fLoop = dwFlags == DSBPLAY_LOOPING;
-   if (me->fLoop)
-      me->status |= DSBSTATUS_LOOPING;
-
-   dprintf(("  Buffer %X: start at pos %d, loop %s",me, me->playpos, me->fLoop?"YES":"NO"));
+   if (!me->fPlaying) {
+      me->frac     = 0;
+      me->fPlaying = TRUE;
+      me->status   = DSBSTATUS_PLAYING;
+      me->fLoop = dwFlags == DSBPLAY_LOOPING;
+      if (me->fLoop)
+         me->status |= DSBSTATUS_LOOPING;
+
+      dprintf(("  Buffer %X: start at pos %d, loop %s",me, me->playpos, me->fLoop?"YES":"NO"));
+   }
+   else {
+      me->fLoop = dwFlags == DSBPLAY_LOOPING;
+      if (me->fLoop)
+         me->status |= DSBSTATUS_LOOPING;
+
+      dprintf(("  Buffer %X: already playing, loop %s",me, me->fLoop?"YES":"NO"));
+   }
+
    return DS_OK;
 }
@@ -507 +517 @@
    OS2IDirectSoundBuffer *me = (OS2IDirectSoundBuffer *)This;
 
-   dprintf(("DSOUND-OS2IDirectSoundBuffer::SoundBufSetVolume (buf=%X)", me));
-   if (me == NULL) {
-      return DSERR_INVALIDPARAM;
-   }
-   me->DSvolume = lVolume;
+   dprintf(("DSOUND-OS2IDirectSoundBuffer::SoundBufSetVolume (%d, buf=%X)", lVolume, me));
+   if (me == NULL) {
+      return DSERR_INVALIDPARAM;
+   }
+   me->DSvolume = (lVolume > 0) ? 0 : lVolume;
 
    /* = (10 ^ (1/10)) = 1dB - but the formula below gives results _very_ similar */
    /* to 'real' DirectSound, indistinguishable for all practical purposes        */
-   me->volume = 255.0 * pow(4, lVolume / 1000.0);
+   me->volume = 255.0 * pow(4, me->DSvolume / 1000.0);
+   dprintf(("  New volume: %d", me->volume));
 
    return DS_OK;
@@ -525 +536 @@
    OS2IDirectSoundBuffer *me = (OS2IDirectSoundBuffer *)This;
 
-   dprintf(("DSOUND-OS2IDirectSoundBuffer::SoundBufSetPan (buf=%X)", me));
+   dprintf(("DSOUND-OS2IDirectSoundBuffer::SoundBufSetPan (%d, buf=%X)", lPan, me));
    if (me == NULL) {
       return DSERR_INVALIDPARAM;

trunk/src/dsound/new/OS2SNDBUFFER.H

@@ -1 @@
-/* $Id: OS2SNDBUFFER.H,v 1.2 2000-03-08 18:26:48 mike Exp $ */
+/* $Id: OS2SNDBUFFER.H,v 1.3 2000-03-08 20:44:09 mike Exp $ */
 
 /*
@@ -52 +52 @@
     BOOL  fLocked;             // is buffer currently locked?
     BOOL  fPrimary;            // is this a primary buffer?
-    DWORD DSvolume;            // DSB volume (in dB)
+    LONG  DSvolume;            // DSB volume (in dB)
     LONG  volume;              // volume (linear)
     LONG  DSpan;               // DSB pan (in dB)