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

Timestamp:

Nov 27, 2010, 11:27:43 AM (15 years ago)

Author:

dmik

Message:

Get rid of dd_obj_base.h which duplicates obj_base.h creating unnecessary mess (symbol/define duplication) and conflicts when both the DDarw and other COM-related headers are included.

File:

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

trunk/src/dsound/OS2SNDBUFFER.CPP

@@ -21 +21 @@
 #include <string.h>
 
-#define INITGUID
+#define CINTERFACE
 #include <dsound.h>
 
@@ -52 +52 @@
    //This is the "normal" constructor
    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;
+   Vtbl.fnAddRef               = SoundBufAddRef;
+   Vtbl.fnRelease              = SoundBufRelease;
+   Vtbl.fnQueryInterface       = SoundBufQueryInterface;
+   Vtbl.fnGetCaps              = SoundBufGetCaps;
+   Vtbl.fnGetFormat            = SoundBufGetFormat;
+   Vtbl.fnGetVolume            = SoundBufGetVolume;
+   Vtbl.fnGetStatus            = SoundBufGetStatus;
+   Vtbl.fnGetCurrentPosition   = SoundBufGetCurrentPosition;
+   Vtbl.fnGetPan               = SoundBufGetPan;
+   Vtbl.fnGetFrequency         = SoundBufGetFrequency;
+   Vtbl.fnInitialize           = SoundBufInitialize;
+   Vtbl.fnRestore              = SoundBufRestore;
+   Vtbl.fnSetFormat            = SoundBufSetFormat;
+   Vtbl.fnSetVolume            = SoundBufSetVolume;
+   Vtbl.fnSetCurrentPosition   = SoundBufSetCurrentPosition;
+   Vtbl.fnSetPan               = SoundBufSetPan;
+   Vtbl.fnSetFrequency         = SoundBufSetFrequency;
+   Vtbl.fnLock                 = SoundBufLock;
+   Vtbl.fnUnlock               = SoundBufUnlock;
+   Vtbl.fnStop                 = SoundBufStop;
+   Vtbl.fnPlay                 = SoundBufPlay;
 
    dprintf(("DSOUND-OS2IDirectSoundBuffer::OS2IDirectSoundBuffer (buf=%X)", this));
@@ -94 +94 @@
    // 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);
+   primary->Vtbl.fnAddRef(primary);
 
    // Start playing the primary buffer
    // TODO: only start playing the primary buffer when necessary!
-   OS2IDirectSoundBuffer::primary->Vtbl.Play(OS2IDirectSoundBuffer::primary, 0, 0, DSBPLAY_LOOPING);
+   OS2IDirectSoundBuffer::primary->Vtbl.fnPlay(OS2IDirectSoundBuffer::primary, 0, 0, DSBPLAY_LOOPING);
 
    parentDS  = DSound;
@@ -156 +156 @@
    //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;
+   Vtbl.fnAddRef               = SoundBufAddRef;
+   Vtbl.fnRelease              = SoundBufRelease;
+   Vtbl.fnQueryInterface       = SoundBufQueryInterface;
+   Vtbl.fnGetCaps              = SoundBufGetCaps;
+   Vtbl.fnGetFormat            = SoundBufGetFormat;
+   Vtbl.fnGetVolume            = SoundBufGetVolume;
+   Vtbl.fnGetStatus            = SoundBufGetStatus;
+   Vtbl.fnGetCurrentPosition   = SoundBufGetCurrentPosition;
+   Vtbl.fnGetPan               = SoundBufGetPan;
+   Vtbl.fnGetFrequency         = SoundBufGetFrequency;
+   Vtbl.fnInitialize           = SoundBufInitialize;
+   Vtbl.fnRestore              = SoundBufRestore;
+   Vtbl.fnSetFormat            = SoundBufSetFormat;
+   Vtbl.fnSetVolume            = SoundBufSetVolume;
+   Vtbl.fnSetCurrentPosition   = SoundBufSetCurrentPosition;
+   Vtbl.fnSetPan               = SoundBufSetPan;
+   Vtbl.fnSetFrequency         = SoundBufSetFrequency;
+   Vtbl.fnLock                 = SoundBufLock;
+   Vtbl.fnUnlock               = SoundBufUnlock;
+   Vtbl.fnStop                 = SoundBufStop;
+   Vtbl.fnPlay                 = SoundBufPlay;
 
    dprintf(("DSOUND-OS2IDirectSoundBuffer::OS2IDirectSoundBuffer/Duplicate (buf=%X)", this));
@@ -197 +197 @@
    // 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);
+   primary->Vtbl.fnAddRef(primary);
 
    parentDS  = DSound;
@@ -259 +259 @@
 
    // release the primary buffer too
-   primary->Vtbl.Release(primary);
+   primary->Vtbl.fnRelease(primary);
 
    if (this == dsbroot)  // is this the first SoundBuffer?
@@ -284 +284 @@
 
    if (primary != NULL)
-      primary->Vtbl.Stop(primary);
+      primary->Vtbl.fnStop(primary);
 
    while (cur != NULL) {
@@ -293 +293 @@
    dprintf(("DSOUND-OS2IDirectSoundBuffer::DestroyAllBuffers - %X", primary));
    if (primary != NULL)
-      primary->Vtbl.Release(primary);
+      primary->Vtbl.fnRelease(primary);
 }
 
@@ -306 +306 @@
    *ppvObj = NULL;
 
-   if (IsEqualGUID(riid, IID_IDirectSoundBuffer)) {
+   if (IsEqualGUID(riid, &IID_IDirectSoundBuffer)) {
       *ppvObj = This;
 
@@ -313 +313 @@
    }
 
-   if (IsEqualGUID(riid, IID_IDirectSoundNotify)) {
+   if (IsEqualGUID(riid, &IID_IDirectSoundNotify)) {
       OS2IDirectSoundBuffer  *me     = (OS2IDirectSoundBuffer *)This;
       OS2IDirectSoundNotify  *notify;
@@ -319 +319 @@
       notify     = new OS2IDirectSoundNotify(me);
       *ppvObj    = notify;
-      notify->Vtbl.AddRef(notify);
+      notify->Vtbl.fnAddRef(notify);
       return DS_OK;
    }
 
-   if (IsEqualGUID(riid, IID_IDirectSound3DBuffer)) {
+   if (IsEqualGUID(riid, &IID_IDirectSound3DBuffer)) {
       OS2IDirectSoundBuffer   *me     = (OS2IDirectSoundBuffer *)This;
       OS2IDirectSound3DBuffer *buffer3D;
@@ -329 +329 @@
       buffer3D   = new OS2IDirectSound3DBuffer(me);
       *ppvObj    = buffer3D;
-      buffer3D->Vtbl.AddRef((IDirectSound3DBuffer *)buffer3D);
+      buffer3D->Vtbl.fnAddRef((IDirectSound3DBuffer *)buffer3D);
       return DS_OK;
    }