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

Timestamp:

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

Author:

mike

Message:

Added DuplicateSoundBuffer support

File:

• trunk/src/dsound/OS2DSOUND.CPP (modified) (21 diffs)

trunk/src/dsound/OS2DSOUND.CPP

@@ -1 @@
-/* $Id: OS2DSOUND.CPP,v 1.7 2000-05-18 20:37:08 mike Exp $ */
+/* $Id: OS2DSOUND.CPP,v 1.8 2001-03-10 06:21:06 mike Exp $ */
 
 /*
@@ -5 +5 @@
  *
  * Copyright 1998 Sander van Leeuwen
- * Copyright 2000 Michal Necasek
+ * Copyright 2000 Kevin Langman
+ * Copyright 2001 Michal Necasek
  *
  * Project Odin Software License can be found in LICENSE.TXT
@@ -18 +19 @@
 #include <string.h>
 
-
-
 #include <stdio.h> /****** DEBUGGING ********/
-
-
 
 #define INITGUID
@@ -34 +31 @@
 #include <misc.h>
 
-// TODO: primary buffer should probably created right away when creating the DSound
-// object
 // TODO: handle cooperative levels properly!!
 
@@ -60 +55 @@
    Vtbl.Initialize           = SoundInitialize;
 
-   dprintf(("DSOUND-OS2IDirectSound::OS2IDirectSound\n"));
+   dprintf(("DSOUND-OS2IDirectSound::OS2IDirectSound"));
 
    speakerConfig = DSSPEAKER_STEREO;
@@ -75 +70 @@
    if ( primary->GetLastError() != DS_OK ){
       ULONG lastErr = primary->GetLastError();
-      dprintf(("LastErr = %d\n", lastErr));
+      dprintf(("LastErr = %d", lastErr));
       delete primary;
       lastError = lastErr;
@@ -82 +77 @@
    primary->Vtbl.AddRef(primary);
 
-   dprintf(("Sound init OK\n"));
-}
+   dprintf(("Sound init OK"));
+}
+
 //******************************************************************************
 //******************************************************************************
@@ -92 +88 @@
    OS2IDirectSound::fDSExists = FALSE;
 }
+
 //******************************************************************************
 //******************************************************************************
 HRESULT WIN32API SoundQueryInterface(THIS, REFIID riid, LPVOID * ppvObj)
 {
-   dprintf(("DSOUND-OS2IDirectSound::QueryInterface\n"));
+   dprintf(("DSOUND-OS2IDirectSound::QueryInterface"));
    if (This == NULL) {
       return DSERR_INVALIDPARAM;
@@ -118 +115 @@
    OS2IDirectSound *me = (OS2IDirectSound *)This;
 
-   dprintf(("DSOUND-OS2IDirectSound::AddRef %d\n", me->Referenced+1));
+   dprintf(("DSOUND-OS2IDirectSound::AddRef %d", me->Referenced+1));
    return ++me->Referenced;
 }
@@ -128 +125 @@
    OS2IDirectSound *me = (OS2IDirectSound *)This;
 
-   dprintf(("DSOUND-OS2IDirectSound::Release %d\n", me->Referenced-1));
+   dprintf(("DSOUND-OS2IDirectSound::Release %d", me->Referenced-1));
    if (me->Referenced) {
       me->Referenced--;
@@ -146 +143 @@
 HRESULT WIN32API SoundCompact(THIS)
 {
-  dprintf(("DSOUND-OS2IDirectSound::Compact\n"));
+  dprintf(("DSOUND-OS2IDirectSound::Compact - NOP"));
   return DS_OK;
 }
@@ -160 +157 @@
    OS2IDirectSoundBuffer *sndbuf;
 
-   dprintf(("DSOUND-OS2IDirectSound::CreateSoundBuffer\n"));
+   dprintf(("DSOUND-OS2IDirectSound::CreateSoundBuffer"));
    if (me == NULL || lpDSBufferDesc == NULL || lplpDirectSoundBuffer == NULL) {
       return DSERR_INVALIDPARAM;
@@ -171 +168 @@
 
    if (lpDSBufferDesc->dwFlags & DSBCAPS_PRIMARYBUFFER) {
-
-/*
-
-      // The Primary buffer is now created by the Constructor.. This only
-      // makes sence becuse you can really only have one primary buffer and
-      // you need it before you can to do anything.
-
-      OS2PrimBuff *primbuff;
-      primbuff = new OS2PrimBuff(me, lpDSBufferDesc);
-
-      if (primbuff == NULL)
-         return DSERR_OUTOFMEMORY;
-
-      if ( primbuff->GetLastError() != DS_OK ){
-         ULONG lastErr = primbuff->GetLastError();
-
-         dprintf(("LastErr = %d\n", lastErr));
-         delete primbuff;
-         return lastErr;
-      }
-      *lplpDirectSoundBuffer = (LPDIRECTSOUNDBUFFER)primbuff;
-      primbuff->Vtbl.AddRef(primbuff);
-      dprintf(("Created PrimBuff... Exiting Create Buffer function\n"));
-*/
-
       *lplpDirectSoundBuffer = (LPDIRECTSOUNDBUFFER)me->primary;
       return DS_OK;
@@ -204 +176 @@
       return DSERR_OUTOFMEMORY;
    }
-   if(sndbuf->GetLastError() != DS_OK) {
+   if (sndbuf->GetLastError() != DS_OK) {
       ULONG lastErr = sndbuf->GetLastError();
       delete sndbuf;
@@ -220 +192 @@
 HRESULT WIN32API SoundGetCaps(THIS_ LPDSCAPS lpCaps)
 {
-   dprintf(("DSOUND-OS2IDirectSound::GetCaps\n"));
+   dprintf(("DSOUND-OS2IDirectSound::GetCaps"));
 
    if (lpCaps == NULL)
@@ -258 +230 @@
 //******************************************************************************
 //******************************************************************************
-HRESULT WIN32API SoundDuplicateSoundBuffer(THIS_ LPDIRECTSOUNDBUFFER, LPLPDIRECTSOUNDBUFFER )
-{
-   dprintf(("DSOUND-OS2IDirectSound::DuplicateSoundBuffer\n"));
-   return DSERR_OUTOFMEMORY;
+HRESULT WIN32API SoundDuplicateSoundBuffer(THIS_ LPDIRECTSOUNDBUFFER lpBuf, LPLPDIRECTSOUNDBUFFER lplpDirectSoundBuffer)
+{
+   OS2IDirectSound *me = (OS2IDirectSound *)This;
+   OS2IDirectSoundBuffer *srcBuf = (OS2IDirectSoundBuffer*)lpBuf;
+   OS2IDirectSoundBuffer *tgtBuf;
+
+   dprintf(("DSOUND-OS2IDirectSound::DuplicateSoundBuffer (%X to %X)", lpBuf, lplpDirectSoundBuffer));
+   if (me == NULL || lpBuf == NULL || lplpDirectSoundBuffer == NULL) {
+      return DSERR_INVALIDPARAM;
+   }
+
+   tgtBuf = new OS2IDirectSoundBuffer(me, srcBuf);
+   if (tgtBuf == NULL) {
+      return DSERR_OUTOFMEMORY;
+   }
+
+   if (tgtBuf->GetLastError() != DS_OK) {
+      ULONG lastErr = tgtBuf->GetLastError();
+      delete tgtBuf;
+      return lastErr;
+   }
+   tgtBuf->Vtbl.AddRef(tgtBuf);
+
+   *lplpDirectSoundBuffer = (LPDIRECTSOUNDBUFFER)tgtBuf;
+
+   return DS_OK;
 }
 
@@ -270 +264 @@
    OS2IDirectSound *me = (OS2IDirectSound *)This;
 
-   dprintf(("DSOUND-OS2IDirectSound::SetCooperativeLevel (to %d)\n", level));
+   dprintf(("DSOUND-OS2IDirectSound::SetCooperativeLevel (to %d)", level));
    if (me == NULL) {
      return DSERR_INVALIDPARAM;
@@ -278 +272 @@
    return DS_OK;
 }
+
 //******************************************************************************
 //******************************************************************************
@@ -284 +279 @@
    OS2IDirectSound *me = (OS2IDirectSound *)This;
 
-   dprintf(("DSOUND-OS2IDirectSound::GetSpeakerConfig\n"));
+   dprintf(("DSOUND-OS2IDirectSound::GetSpeakerConfig"));
    if (me == NULL) {
       return(DSERR_INVALIDPARAM);
@@ -299 +294 @@
    OS2IDirectSound *me = (OS2IDirectSound *)This;
 
-   dprintf(("DSOUND-OS2IDirectSound::SetSpeakerConfig %X\n", speakerCfg));
+   dprintf(("DSOUND-OS2IDirectSound::SetSpeakerConfig %X", speakerCfg));
    if (me == NULL) {
      return DSERR_INVALIDPARAM;
@@ -311 +306 @@
 HRESULT WIN32API SoundInitialize(THIS_ LPGUID)
 {
-   dprintf(("DSOUND-OS2IDirectSound::Initialize NOP\n"));
-   return DS_OK;
-}
-//******************************************************************************
-//******************************************************************************
+   dprintf(("DSOUND-OS2IDirectSound::Initialize NOP"));
+   return DS_OK;
+}
+//******************************************************************************
+//******************************************************************************