Changeset 21479 for trunk/src/dsound/OS2PrimBuff.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/OS2PrimBuff.cpp (modified) (5 diffs)

trunk/src/dsound/OS2PrimBuff.cpp

@@ -33 +33 @@
 #include <string.h>
 
-#define INITGUID
+#define CINTERFACE
 #include <dsound.h>
 
@@ -55 +55 @@
 {
    lpVtbl = &Vtbl;
-   Vtbl.AddRef               = PrimBufAddRef;
-   Vtbl.Release              = PrimBufRelease;
-   Vtbl.QueryInterface       = PrimBufQueryInterface;
-   Vtbl.GetCaps              = PrimBufGetCaps;
-   Vtbl.GetFormat            = PrimBufGetFormat;
-   Vtbl.GetVolume            = PrimBufGetVolume;
-   Vtbl.GetStatus            = PrimBufGetStatus;
-   Vtbl.GetCurrentPosition   = PrimBufGetCurrentPosition;
-   Vtbl.GetPan               = PrimBufGetPan;
-   Vtbl.GetFrequency         = PrimBufGetFrequency;
-   Vtbl.Initialize           = PrimBufInitialize;
-   Vtbl.Restore              = PrimBufRestore;
-   Vtbl.SetFormat            = PrimBufSetFormat;
-   Vtbl.SetVolume            = PrimBufSetVolume;
-   Vtbl.SetCurrentPosition   = PrimBufSetCurrentPosition;
-   Vtbl.SetPan               = PrimBufSetPan;
-   Vtbl.SetFrequency         = PrimBufSetFrequency;
-   Vtbl.Lock                 = PrimBufLock;
-   Vtbl.Unlock               = PrimBufUnlock;
-   Vtbl.Stop                 = PrimBufStop;
-   Vtbl.Play                 = PrimBufPlay;
+   Vtbl.fnAddRef               = PrimBufAddRef;
+   Vtbl.fnRelease              = PrimBufRelease;
+   Vtbl.fnQueryInterface       = PrimBufQueryInterface;
+   Vtbl.fnGetCaps              = PrimBufGetCaps;
+   Vtbl.fnGetFormat            = PrimBufGetFormat;
+   Vtbl.fnGetVolume            = PrimBufGetVolume;
+   Vtbl.fnGetStatus            = PrimBufGetStatus;
+   Vtbl.fnGetCurrentPosition   = PrimBufGetCurrentPosition;
+   Vtbl.fnGetPan               = PrimBufGetPan;
+   Vtbl.fnGetFrequency         = PrimBufGetFrequency;
+   Vtbl.fnInitialize           = PrimBufInitialize;
+   Vtbl.fnRestore              = PrimBufRestore;
+   Vtbl.fnSetFormat            = PrimBufSetFormat;
+   Vtbl.fnSetVolume            = PrimBufSetVolume;
+   Vtbl.fnSetCurrentPosition   = PrimBufSetCurrentPosition;
+   Vtbl.fnSetPan               = PrimBufSetPan;
+   Vtbl.fnSetFrequency         = PrimBufSetFrequency;
+   Vtbl.fnLock                 = PrimBufLock;
+   Vtbl.fnUnlock               = PrimBufUnlock;
+   Vtbl.fnStop                 = PrimBufStop;
+   Vtbl.fnPlay                 = PrimBufPlay;
 
    dprintf(("DSOUND-PrimBuff: Constructor"));
@@ -135 +135 @@
    *ppvObj = NULL;
 
-   if (IsEqualGUID(riid, IID_IDirectSoundBuffer)) {
+   if (IsEqualGUID(riid, &IID_IDirectSoundBuffer)) {
       *ppvObj = This;
       PrimBufAddRef(This);
@@ -142 +142 @@
 
 
-   if (IsEqualGUID(riid, IID_IDirectSound3DListener)) {
+   if (IsEqualGUID(riid, &IID_IDirectSound3DListener)) {
       OS2PrimBuff                *me = (OS2PrimBuff *)This;
       OS2IDirectSound3DListener  *listener;
@@ -148 +148 @@
       listener     = new OS2IDirectSound3DListener(me);
       *ppvObj      = listener;
-      listener->Vtbl.AddRef((IDirectSound3DListener *)listener);
+      listener->Vtbl.fnAddRef((IDirectSound3DListener *)listener);
       return DS_OK;
    }