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

trunk/src/dsound/DAudioNotify.cpp

@@ -19 +19 @@
 #include <string.h>
 
-#define INITGUID
+#define CINTERFACE
 #include <dsound.h>
 
@@ -32 +32 @@
 {
    lpVtbl = &Vtbl;
-   Vtbl.AddRef                   = DAudioNotifyAddRef;
-   Vtbl.Release                  = DAudioNotifyRelease;
-   Vtbl.QueryInterface           = DAudioNotifyQueryInterface;
-   Vtbl.SetNotificationPositions = DAudioNotifySetNotificationPositions;
+   Vtbl.fnAddRef                   = DAudioNotifyAddRef;
+   Vtbl.fnRelease                  = DAudioNotifyRelease;
+   Vtbl.fnQueryInterface           = DAudioNotifyQueryInterface;
+   Vtbl.fnSetNotificationPositions = DAudioNotifySetNotificationPositions;
 
    dprintf(("DSOUND-IDirectAudioNotify::IDirectAudioNotify (this=%X)", this));
@@ -45 +45 @@
 
    // add a reference to the parent SoundBuffer to make sure it won't suddenly disappear
-   lpSoundBuffer->Vtbl.AddRef(lpSoundBuffer);
+   lpSoundBuffer->Vtbl.fnAddRef(lpSoundBuffer);
    // set pointer to ourselves in parent SoundBuffer
    lpSoundBuffer->SetNotify(this);
@@ -56 +56 @@
    dprintf(("DSOUND-IDirectAudioNotify::~IDirectAudioNotify (this=%X)", this));
    lpSoundBuffer->SetNotify(NULL);
-   lpSoundBuffer->Vtbl.Release(lpSoundBuffer);
+   lpSoundBuffer->Vtbl.fnRelease(lpSoundBuffer);
    if (lpPositions != NULL)
       free(lpPositions);
@@ -71 +71 @@
    *ppvObj = NULL;
 
-   if (!IsEqualGUID(riid, IID_IDirectSoundNotify))
+   if (!IsEqualGUID(riid, &IID_IDirectSoundNotify))
       return E_NOINTERFACE;