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

Timestamp:

May 18, 2000, 10:37:10 PM (25 years ago)

Author:

mike

Message:

Updated and slightly fixed DSOUND

File:

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

trunk/src/dsound/OS2DSOUND.CPP

@@ -1 @@
-/* $Id: OS2DSOUND.CPP,v 1.6 2000-03-13 12:47:46 sandervl Exp $ */
+/* $Id: OS2DSOUND.CPP,v 1.7 2000-05-18 20:37:08 mike Exp $ */
 
 /*
@@ -17 +17 @@
 #include <stdlib.h>
 #include <string.h>
+
+
+
+#include <stdio.h> /****** DEBUGGING ********/
+
+
 
 #define INITGUID
@@ -61 +67 @@
    OS2IDirectSound::fDSExists = TRUE;
 
+   // Create the primary buffer
+   primary = new OS2PrimBuff(this, /*lpDSBufferDesc*/NULL);
+   if (primary == NULL){
+      lastError = DSERR_OUTOFMEMORY;
+      return ;
+   }
+   if ( primary->GetLastError() != DS_OK ){
+      ULONG lastErr = primary->GetLastError();
+      dprintf(("LastErr = %d\n", lastErr));
+      delete primary;
+      lastError = lastErr;
+      return;
+   }
+   primary->Vtbl.AddRef(primary);
+
    dprintf(("Sound init OK\n"));
 }
@@ -150 +171 @@
 
    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);
@@ -166 +194 @@
       primbuff->Vtbl.AddRef(primbuff);
       dprintf(("Created PrimBuff... Exiting Create Buffer function\n"));
-
+*/
+
+      *lplpDirectSoundBuffer = (LPDIRECTSOUNDBUFFER)me->primary;
       return DS_OK;
    }