Changeset 5292 for trunk/src/dsound/OS2SNDBUFFER.CPP

Timestamp:

Mar 10, 2001, 7:21:06 AM (24 years ago)

Author:

mike

Message:

Added DuplicateSoundBuffer support

File:

• trunk/src/dsound/OS2SNDBUFFER.CPP (modified) (8 diffs)

trunk/src/dsound/OS2SNDBUFFER.CPP

@@ -1 @@
-/* $Id: OS2SNDBUFFER.CPP,v 1.9 2001-03-06 20:11:16 mike Exp $ */
+/* $Id: OS2SNDBUFFER.CPP,v 1.10 2001-03-10 06:21:06 mike Exp $ */
 
 /*
@@ -5 +5 @@
  *
  * Copyright 1998 Sander van Leeuwen (sandervl@xs4all.nl)
- * Copyright 2000 Michal Necasek
+ * Copyright 2001 Michal Necasek
  *
  * Project Odin Software License can be found in LICENSE.TXT
@@ -50 +50 @@
         : Referenced(0), lastError(DS_OK)
 {
+   //This is the "normal" constructor
    lpVtbl = &Vtbl;
    Vtbl.AddRef               = SoundBufAddRef;
@@ -110 +111 @@
    DSpan     = 0;
    lpfxFormat= NULL;
-   lpBuffer  = NULL;
    fPlaying  = FALSE;
    fLoop     = FALSE;
@@ -135 +135 @@
    dprintf((" Buffer format: %dHz, %dbit, %d channels", lpfxFormat->nSamplesPerSec, lpfxFormat->wBitsPerSample, lpfxFormat->nChannels));
 
-   lpBuffer = (LPSTR)VirtualAlloc(0, bufferdesc.dwBufferBytes, MEM_COMMIT, PAGE_READWRITE);
-   if (lpBuffer == NULL) {
+   lpSndBuffer = (SOUNDBUF*)VirtualAlloc(0, bufferdesc.dwBufferBytes + sizeof(DWORD), MEM_COMMIT, PAGE_READWRITE);
+   if (lpSndBuffer == NULL) {
       dprintf(("VirtualAlloc failed"));
-      lpBuffer  = NULL;
+      lpSndBuffer  = NULL;
       lastError = DSERR_OUTOFMEMORY;
       return;
    }
+   lpBuffer = &(lpSndBuffer->pData[0]);
+   lpSndBuffer->dwReferences = 1;
+
+   next = dsbroot;
+   dsbroot = this;
+}
+
+//******************************************************************************
+//******************************************************************************
+OS2IDirectSoundBuffer::OS2IDirectSoundBuffer(OS2IDirectSound *DSound, OS2IDirectSoundBuffer *srcBuf)
+        : Referenced(0), lastError(DS_OK)
+{
+   //This is the constructor used for duplicating sound buffers
+   lpVtbl = &Vtbl;
+   Vtbl.AddRef               = SoundBufAddRef;
+   Vtbl.Release              = SoundBufRelease;
+   Vtbl.QueryInterface       = SoundBufQueryInterface;
+   Vtbl.GetCaps              = SoundBufGetCaps;
+   Vtbl.GetFormat            = SoundBufGetFormat;
+   Vtbl.GetVolume            = SoundBufGetVolume;
+   Vtbl.GetStatus            = SoundBufGetStatus;
+   Vtbl.GetCurrentPosition   = SoundBufGetCurrentPosition;
+   Vtbl.GetPan               = SoundBufGetPan;
+   Vtbl.GetFrequency         = SoundBufGetFrequency;
+   Vtbl.Initialize           = SoundBufInitialize;
+   Vtbl.Restore              = SoundBufRestore;
+   Vtbl.SetFormat            = SoundBufSetFormat;
+   Vtbl.SetVolume            = SoundBufSetVolume;
+   Vtbl.SetCurrentPosition   = SoundBufSetCurrentPosition;
+   Vtbl.SetPan               = SoundBufSetPan;
+   Vtbl.SetFrequency         = SoundBufSetFrequency;
+   Vtbl.Lock                 = SoundBufLock;
+   Vtbl.Unlock               = SoundBufUnlock;
+   Vtbl.Stop                 = SoundBufStop;
+   Vtbl.Play                 = SoundBufPlay;
+
+   dprintf(("DSOUND-OS2IDirectSoundBuffer::OS2IDirectSoundBuffer/Duplicate (buf=%X)", this));
+
+   if (srcBuf->fPrimary) {
+      dprintf(("Error: Cannot duplicate primary sound buffer!"));
+      lpBuffer  = NULL;
+      lastError = DSERR_INVALIDPARAM;
+      return;
+   }
+
+   // get the primary buffer from the DSound instance.
+   primary = DSound->primary;
+
+   // No need to check if primary exists - it has to (this can't be the first
+   // secondary buffer being created)
+
+   // Add a reference to the primary buffer for _every_ secondary buffer; this makes
+   // sure that as long as a secondary buffer exists the primary buffer won't get
+   // destroyed; moreover if the user didn't create  a primary buffer himself/herself,
+   // it will automatically get created and destroyed with the last secondary buffer
+   primary->Vtbl.AddRef(primary);
+
+   parentDS  = DSound;
+   writepos  = 0;
+   playpos   = 0;
+   status    = 0;
+   fLocked   = FALSE;
+   fPrimary  = FALSE;
+   volume    = srcBuf->volume;
+   DSvolume  = srcBuf->DSvolume;
+   pan       = srcBuf->pan;
+   DSpan     = srcBuf->DSpan;
+   lpBuffer  = srcBuf->lpBuffer;
+   fPlaying  = FALSE;
+   fLoop     = srcBuf->fLoop;
+   notify    = NULL;
+   memcpy(&bufferdesc, &(srcBuf->bufferdesc), sizeof(DSBUFFERDESC));
+
+   // Note: this cannot be a primary buffer - those take a different route
+
+   // frequency has to be set according to the bufer format
+   frequency = srcBuf->frequency;
+
+   lpfxFormat = (WAVEFORMATEX *)malloc(sizeof(WAVEFORMATEX));
+   memcpy(lpfxFormat,srcBuf->lpfxFormat,
+          sizeof(WAVEFORMATEX));
+
+   dprintf((" Buffer format: %dHz, %dbit, %d channels", lpfxFormat->nSamplesPerSec, lpfxFormat->wBitsPerSample, lpfxFormat->nChannels));
+
+   // Increment reference count for the buffer memory
+   lpSndBuffer  = srcBuf->lpSndBuffer;
+   lpSndBuffer->dwReferences++;
 
    next = dsbroot;
@@ -157 +244 @@
    dprintf(("DSOUND-OS2IDirectSoundBuffer::~OS2IDirectSoundBuffer (buf=%X)", this));
 
-   // free allocted memory
-   if (lpBuffer)
-      VirtualFree(lpBuffer, 0, MEM_RELEASE);
+   // free allocted memory - unless it's shared by a duplicated buffer
+   if (lpSndBuffer) {
+      lpSndBuffer->dwReferences--;
+      if (lpSndBuffer->dwReferences == 0)
+         VirtualFree(lpSndBuffer, 0, MEM_RELEASE);
+   }
 
    if (lpfxFormat)
@@ -328 +418 @@
       return DSERR_INVALIDPARAM;
    }
-   copysize = MIN(ddwSizeAllocated, (me->lpfxFormat->cbSize + sizeof(WAVEFORMATEX)));
+   copysize = min(ddwSizeAllocated, (me->lpfxFormat->cbSize + sizeof(WAVEFORMATEX)));
    memcpy(lpwfxFormat, me->lpfxFormat, copysize);
 
@@ -457 +547 @@
 {
    OS2IDirectSoundBuffer *me = (OS2IDirectSoundBuffer *)This;
+
+   ULONG ulBytesToPlay;
 
    dprintf(("DSOUND-OS2IDirectSoundBuffer::SoundBufPlay (buf=%X)", me));