[PATCH 2/2] dsound: Merge IDirectSound3DBuffer into the secondary buffer object
Michael Stefaniuc
mstefani at redhat.de
Wed Jan 18 18:18:30 CST 2012
---
I *hate* this type of patches...
Search and replace has basically rewritten most getter and setter
methods. As those used TAB for ident I've just changed them to 4 space indent.
Diff for sound3d.c looks saner with diff --color-words='\S'
dlls/dsound/buffer.c | 22 +--
dlls/dsound/dsound_private.h | 22 +---
dlls/dsound/sound3d.c | 369 +++++++++++++++++++-----------------------
3 files changed, 174 insertions(+), 239 deletions(-)
diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c
index 690d104..0d03686 100644
--- a/dlls/dsound/buffer.c
+++ b/dlls/dsound/buffer.c
@@ -812,15 +812,9 @@ static HRESULT WINAPI IDirectSoundBufferImpl_QueryInterface(IDirectSoundBuffer8
}
if ( IsEqualGUID( &IID_IDirectSound3DBuffer, riid ) ) {
- if (!This->ds3db)
- IDirectSound3DBufferImpl_Create(This, &(This->ds3db));
- if (This->ds3db) {
- IDirectSound3DBuffer_AddRef((LPDIRECTSOUND3DBUFFER)This->ds3db);
- *ppobj = This->ds3db;
- return S_OK;
- }
- WARN("IID_IDirectSound3DBuffer\n");
- return E_NOINTERFACE;
+ IDirectSound3DBuffer_AddRef(&This->IDirectSound3DBuffer_iface);
+ *ppobj = &This->IDirectSound3DBuffer_iface;
+ return S_OK;
}
if ( IsEqualGUID( &IID_IDirectSound3DListener, riid ) ) {
@@ -895,10 +889,12 @@ HRESULT IDirectSoundBufferImpl_Create(
TRACE("Created buffer at %p\n", dsb);
dsb->ref = 0;
+ dsb->ref3D = 0;
dsb->refiks = 0;
dsb->numIfaces = 0;
dsb->device = device;
dsb->IDirectSoundBuffer8_iface.lpVtbl = &dsbvt;
+ dsb->IDirectSound3DBuffer_iface.lpVtbl = &ds3dbvt;
dsb->IKsPropertySet_iface.lpVtbl = &iksbvt;
/* size depends on version */
@@ -1040,12 +1036,6 @@ HRESULT IDirectSoundBufferImpl_Destroy(
* this object until it is ready to be deleted */
InterlockedIncrement(&pdsb->numIfaces);
- if (pdsb->ds3db) {
- WARN("ds3db not NULL\n");
- IDirectSound3DBufferImpl_Destroy(pdsb->ds3db);
- pdsb->ds3db = NULL;
- }
-
if (pdsb->notify) {
WARN("notify not NULL\n");
IDirectSoundNotifyImpl_Destroy(pdsb->notify);
@@ -1090,6 +1080,7 @@ HRESULT IDirectSoundBufferImpl_Duplicate(
dsb->buffer->ref++;
list_add_head(&dsb->buffer->buffers, &dsb->entry);
dsb->ref = 0;
+ dsb->ref3D = 0;
dsb->refiks = 0;
dsb->numIfaces = 0;
dsb->state = STATE_STOPPED;
@@ -1098,7 +1089,6 @@ HRESULT IDirectSoundBufferImpl_Duplicate(
dsb->notifies = NULL;
dsb->nrofnotifies = 0;
dsb->device = device;
- dsb->ds3db = NULL;
DSOUND_RecalcFormat(dsb);
RtlInitializeResource(&dsb->lock);
diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
index 92faff7..d63ee24 100644
--- a/dlls/dsound/dsound_private.h
+++ b/dlls/dsound/dsound_private.h
@@ -49,7 +49,6 @@ typedef struct IDirectSoundBufferImpl IDirectSoundBufferImpl;
typedef struct IDirectSoundCaptureImpl IDirectSoundCaptureImpl;
typedef struct IDirectSoundCaptureBufferImpl IDirectSoundCaptureBufferImpl;
typedef struct IDirectSoundNotifyImpl IDirectSoundNotifyImpl;
-typedef struct IDirectSound3DBufferImpl IDirectSound3DBufferImpl;
typedef struct DirectSoundDevice DirectSoundDevice;
typedef struct DirectSoundCaptureDevice DirectSoundCaptureDevice;
@@ -165,6 +164,7 @@ struct IDirectSoundBufferImpl
{
IDirectSoundBuffer8 IDirectSoundBuffer8_iface;
IDirectSound3DListener IDirectSound3DListener_iface; /* only primary buffer */
+ IDirectSound3DBuffer IDirectSound3DBuffer_iface; /* only secondary buffer */
IKsPropertySet IKsPropertySet_iface;
LONG numIfaces; /* "in use interfaces" refcount */
LONG ref, ref3D, refiks;
@@ -190,7 +190,6 @@ struct IDirectSoundBufferImpl
int nrofnotifies;
/* DirectSound3DBuffer fields */
- IDirectSound3DBufferImpl* ds3db;
DS3DBUFFER ds3db_ds3db;
LONG ds3db_lVolume;
BOOL ds3db_need_recalc;
@@ -211,6 +210,7 @@ HRESULT IDirectSoundBufferImpl_Duplicate(
IDirectSoundBufferImpl *pdsb) DECLSPEC_HIDDEN;
void secondarybuffer_destroy(IDirectSoundBufferImpl *This) DECLSPEC_HIDDEN;
const IDirectSound3DListenerVtbl ds3dlvt DECLSPEC_HIDDEN;
+const IDirectSound3DBufferVtbl ds3dbvt DECLSPEC_HIDDEN;
const IKsPropertySetVtbl iksbvt DECLSPEC_HIDDEN;
/*****************************************************************************
@@ -260,24 +260,6 @@ struct IDirectSoundCaptureBufferImpl
HRESULT IKsPrivatePropertySetImpl_Create(REFIID riid, IKsPropertySet **piks) DECLSPEC_HIDDEN;
-/*****************************************************************************
- * IDirectSound3DBuffer implementation structure
- */
-struct IDirectSound3DBufferImpl
-{
- /* IUnknown fields */
- const IDirectSound3DBufferVtbl *lpVtbl;
- LONG ref;
- /* IDirectSound3DBufferImpl fields */
- IDirectSoundBufferImpl* dsb;
-};
-
-HRESULT IDirectSound3DBufferImpl_Create(
- IDirectSoundBufferImpl *dsb,
- IDirectSound3DBufferImpl **pds3db) DECLSPEC_HIDDEN;
-HRESULT IDirectSound3DBufferImpl_Destroy(
- IDirectSound3DBufferImpl *pds3db) DECLSPEC_HIDDEN;
-
/*******************************************************************************
*/
diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c
index c5428ca..c57aa2e 100644
--- a/dlls/dsound/sound3d.c
+++ b/dlls/dsound/sound3d.c
@@ -319,43 +319,45 @@ static void DSOUND_ChangeListener(IDirectSoundBufferImpl *ds3dl)
/*******************************************************************************
* IDirectSound3DBuffer
*/
+static inline IDirectSoundBufferImpl *impl_from_IDirectSound3DBuffer(IDirectSound3DBuffer *iface)
+{
+ return CONTAINING_RECORD(iface, IDirectSoundBufferImpl, IDirectSound3DBuffer_iface);
+}
/* IUnknown methods */
static HRESULT WINAPI IDirectSound3DBufferImpl_QueryInterface(IDirectSound3DBuffer *iface,
REFIID riid, void **ppobj)
{
- IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface;
+ IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface);
+
+ TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppobj);
- TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppobj);
- return IDirectSoundBuffer_QueryInterface((LPDIRECTSOUNDBUFFER8)This->dsb, riid, ppobj);
+ return IDirectSoundBuffer8_QueryInterface(&This->IDirectSoundBuffer8_iface, riid, ppobj);
}
static ULONG WINAPI IDirectSound3DBufferImpl_AddRef(IDirectSound3DBuffer *iface)
{
- IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface;
- ULONG ref = InterlockedIncrement(&(This->ref));
+ IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface);
+ ULONG ref = InterlockedIncrement(&This->ref3D);
TRACE("(%p) ref was %d\n", This, ref - 1);
if(ref == 1)
- InterlockedIncrement(&This->dsb->numIfaces);
+ InterlockedIncrement(&This->numIfaces);
return ref;
}
static ULONG WINAPI IDirectSound3DBufferImpl_Release(IDirectSound3DBuffer *iface)
{
- IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface;
- ULONG ref = InterlockedDecrement(&(This->ref));
+ IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface);
+ ULONG ref = InterlockedDecrement(&This->ref3D);
+
TRACE("(%p) ref was %d\n", This, ref + 1);
- if (!ref) {
- This->dsb->ds3db = NULL;
- if (!InterlockedDecrement(&This->dsb->numIfaces))
- secondarybuffer_destroy(This->dsb);
- HeapFree(GetProcessHeap(), 0, This);
- TRACE("(%p) released\n", This);
- }
+ if (!ref && !InterlockedDecrement(&This->numIfaces))
+ secondarybuffer_destroy(This);
+
return ref;
}
@@ -363,7 +365,8 @@ static ULONG WINAPI IDirectSound3DBufferImpl_Release(IDirectSound3DBuffer *iface
static HRESULT WINAPI IDirectSound3DBufferImpl_GetAllParameters(IDirectSound3DBuffer *iface,
DS3DBUFFER *lpDs3dBuffer)
{
- IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface;
+ IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface);
+
TRACE("(%p,%p)\n",This,lpDs3dBuffer);
if (lpDs3dBuffer == NULL) {
@@ -377,98 +380,103 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_GetAllParameters(IDirectSound3DBu
}
TRACE("returning: all parameters\n");
- *lpDs3dBuffer = This->dsb->ds3db_ds3db;
+ *lpDs3dBuffer = This->ds3db_ds3db;
return DS_OK;
}
static HRESULT WINAPI IDirectSound3DBufferImpl_GetConeAngles(IDirectSound3DBuffer *iface,
DWORD *lpdwInsideConeAngle, DWORD *lpdwOutsideConeAngle)
{
- IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface;
- TRACE("returning: Inside Cone Angle = %d degrees; Outside Cone Angle = %d degrees\n",
- This->dsb->ds3db_ds3db.dwInsideConeAngle, This->dsb->ds3db_ds3db.dwOutsideConeAngle);
- *lpdwInsideConeAngle = This->dsb->ds3db_ds3db.dwInsideConeAngle;
- *lpdwOutsideConeAngle = This->dsb->ds3db_ds3db.dwOutsideConeAngle;
- return DS_OK;
+ IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface);
+
+ TRACE("returning: Inside Cone Angle = %d degrees; Outside Cone Angle = %d degrees\n",
+ This->ds3db_ds3db.dwInsideConeAngle, This->ds3db_ds3db.dwOutsideConeAngle);
+ *lpdwInsideConeAngle = This->ds3db_ds3db.dwInsideConeAngle;
+ *lpdwOutsideConeAngle = This->ds3db_ds3db.dwOutsideConeAngle;
+ return DS_OK;
}
static HRESULT WINAPI IDirectSound3DBufferImpl_GetConeOrientation(IDirectSound3DBuffer *iface,
D3DVECTOR *lpvConeOrientation)
{
- IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface;
- TRACE("returning: Cone Orientation vector = (%f,%f,%f)\n",
- This->dsb->ds3db_ds3db.vConeOrientation.x,
- This->dsb->ds3db_ds3db.vConeOrientation.y,
- This->dsb->ds3db_ds3db.vConeOrientation.z);
- *lpvConeOrientation = This->dsb->ds3db_ds3db.vConeOrientation;
- return DS_OK;
+ IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface);
+
+ TRACE("returning: Cone Orientation vector = (%f,%f,%f)\n",
+ This->ds3db_ds3db.vConeOrientation.x,
+ This->ds3db_ds3db.vConeOrientation.y,
+ This->ds3db_ds3db.vConeOrientation.z);
+ *lpvConeOrientation = This->ds3db_ds3db.vConeOrientation;
+ return DS_OK;
}
static HRESULT WINAPI IDirectSound3DBufferImpl_GetConeOutsideVolume(IDirectSound3DBuffer *iface,
LONG *lplConeOutsideVolume)
{
- IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface;
- TRACE("returning: Cone Outside Volume = %d\n", This->dsb->ds3db_ds3db.lConeOutsideVolume);
- *lplConeOutsideVolume = This->dsb->ds3db_ds3db.lConeOutsideVolume;
- return DS_OK;
+ IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface);
+
+ TRACE("returning: Cone Outside Volume = %d\n", This->ds3db_ds3db.lConeOutsideVolume);
+ *lplConeOutsideVolume = This->ds3db_ds3db.lConeOutsideVolume;
+ return DS_OK;
}
static HRESULT WINAPI IDirectSound3DBufferImpl_GetMaxDistance(IDirectSound3DBuffer *iface,
D3DVALUE *lpfMaxDistance)
{
- IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface;
- TRACE("returning: Max Distance = %f\n", This->dsb->ds3db_ds3db.flMaxDistance);
- *lpfMaxDistance = This->dsb->ds3db_ds3db.flMaxDistance;
- return DS_OK;
+ IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface);
+
+ TRACE("returning: Max Distance = %f\n", This->ds3db_ds3db.flMaxDistance);
+ *lpfMaxDistance = This->ds3db_ds3db.flMaxDistance;
+ return DS_OK;
}
static HRESULT WINAPI IDirectSound3DBufferImpl_GetMinDistance(IDirectSound3DBuffer *iface,
D3DVALUE *lpfMinDistance)
{
- IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface;
- TRACE("returning: Min Distance = %f\n", This->dsb->ds3db_ds3db.flMinDistance);
- *lpfMinDistance = This->dsb->ds3db_ds3db.flMinDistance;
- return DS_OK;
+ IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface);
+
+ TRACE("returning: Min Distance = %f\n", This->ds3db_ds3db.flMinDistance);
+ *lpfMinDistance = This->ds3db_ds3db.flMinDistance;
+ return DS_OK;
}
static HRESULT WINAPI IDirectSound3DBufferImpl_GetMode(IDirectSound3DBuffer *iface,
DWORD *lpdwMode)
{
- IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface;
- TRACE("returning: Mode = %d\n", This->dsb->ds3db_ds3db.dwMode);
- *lpdwMode = This->dsb->ds3db_ds3db.dwMode;
- return DS_OK;
+ IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface);
+
+ TRACE("returning: Mode = %d\n", This->ds3db_ds3db.dwMode);
+ *lpdwMode = This->ds3db_ds3db.dwMode;
+ return DS_OK;
}
static HRESULT WINAPI IDirectSound3DBufferImpl_GetPosition(IDirectSound3DBuffer *iface,
D3DVECTOR *lpvPosition)
{
- IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface;
- TRACE("returning: Position vector = (%f,%f,%f)\n",
- This->dsb->ds3db_ds3db.vPosition.x,
- This->dsb->ds3db_ds3db.vPosition.y,
- This->dsb->ds3db_ds3db.vPosition.z);
- *lpvPosition = This->dsb->ds3db_ds3db.vPosition;
- return DS_OK;
+ IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface);
+
+ TRACE("returning: Position vector = (%f,%f,%f)\n", This->ds3db_ds3db.vPosition.x,
+ This->ds3db_ds3db.vPosition.y, This->ds3db_ds3db.vPosition.z);
+ *lpvPosition = This->ds3db_ds3db.vPosition;
+ return DS_OK;
}
static HRESULT WINAPI IDirectSound3DBufferImpl_GetVelocity(IDirectSound3DBuffer *iface,
D3DVECTOR *lpvVelocity)
{
- IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface;
- TRACE("returning: Velocity vector = (%f,%f,%f)\n",
- This->dsb->ds3db_ds3db.vVelocity.x,
- This->dsb->ds3db_ds3db.vVelocity.y,
- This->dsb->ds3db_ds3db.vVelocity.z);
- *lpvVelocity = This->dsb->ds3db_ds3db.vVelocity;
- return DS_OK;
+ IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface);
+
+ TRACE("returning: Velocity vector = (%f,%f,%f)\n", This->ds3db_ds3db.vVelocity.x,
+ This->ds3db_ds3db.vVelocity.y, This->ds3db_ds3db.vVelocity.z);
+ *lpvVelocity = This->ds3db_ds3db.vVelocity;
+ return DS_OK;
}
static HRESULT WINAPI IDirectSound3DBufferImpl_SetAllParameters(IDirectSound3DBuffer *iface,
const DS3DBUFFER *lpcDs3dBuffer, DWORD dwApply)
{
- IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface;
+ IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface);
DWORD status = DSERR_INVALIDPARAM;
+
TRACE("(%p,%p,%x)\n",iface,lpcDs3dBuffer,dwApply);
if (lpcDs3dBuffer == NULL) {
@@ -482,13 +490,13 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_SetAllParameters(IDirectSound3DBu
}
TRACE("setting: all parameters; dwApply = %d\n", dwApply);
- This->dsb->ds3db_ds3db = *lpcDs3dBuffer;
+ This->ds3db_ds3db = *lpcDs3dBuffer;
if (dwApply == DS3D_IMMEDIATE)
{
- DSOUND_Mix3DBuffer(This->dsb);
+ DSOUND_Mix3DBuffer(This);
}
- This->dsb->ds3db_need_recalc = TRUE;
+ This->ds3db_need_recalc = TRUE;
status = DS_OK;
return status;
@@ -497,131 +505,137 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_SetAllParameters(IDirectSound3DBu
static HRESULT WINAPI IDirectSound3DBufferImpl_SetConeAngles(IDirectSound3DBuffer *iface,
DWORD dwInsideConeAngle, DWORD dwOutsideConeAngle, DWORD dwApply)
{
- IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface;
- TRACE("setting: Inside Cone Angle = %d; Outside Cone Angle = %d; dwApply = %d\n",
- dwInsideConeAngle, dwOutsideConeAngle, dwApply);
- This->dsb->ds3db_ds3db.dwInsideConeAngle = dwInsideConeAngle;
- This->dsb->ds3db_ds3db.dwOutsideConeAngle = dwOutsideConeAngle;
- if (dwApply == DS3D_IMMEDIATE)
- {
- DSOUND_Mix3DBuffer(This->dsb);
- }
- This->dsb->ds3db_need_recalc = TRUE;
- return DS_OK;
+ IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface);
+
+ TRACE("setting: Inside Cone Angle = %d; Outside Cone Angle = %d; dwApply = %d\n",
+ dwInsideConeAngle, dwOutsideConeAngle, dwApply);
+ This->ds3db_ds3db.dwInsideConeAngle = dwInsideConeAngle;
+ This->ds3db_ds3db.dwOutsideConeAngle = dwOutsideConeAngle;
+ if (dwApply == DS3D_IMMEDIATE)
+ DSOUND_Mix3DBuffer(This);
+ This->ds3db_need_recalc = TRUE;
+ return DS_OK;
}
static HRESULT WINAPI IDirectSound3DBufferImpl_SetConeOrientation(IDirectSound3DBuffer *iface,
D3DVALUE x, D3DVALUE y, D3DVALUE z, DWORD dwApply)
{
- IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface;
- TRACE("setting: Cone Orientation vector = (%f,%f,%f); dwApply = %d\n", x, y, z, dwApply);
- This->dsb->ds3db_ds3db.vConeOrientation.x = x;
- This->dsb->ds3db_ds3db.vConeOrientation.y = y;
- This->dsb->ds3db_ds3db.vConeOrientation.z = z;
- if (dwApply == DS3D_IMMEDIATE)
- {
- This->dsb->ds3db_need_recalc = FALSE;
- DSOUND_Mix3DBuffer(This->dsb);
- }
- This->dsb->ds3db_need_recalc = TRUE;
- return DS_OK;
+ IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface);
+
+ TRACE("setting: Cone Orientation vector = (%f,%f,%f); dwApply = %d\n", x, y, z, dwApply);
+ This->ds3db_ds3db.vConeOrientation.x = x;
+ This->ds3db_ds3db.vConeOrientation.y = y;
+ This->ds3db_ds3db.vConeOrientation.z = z;
+ if (dwApply == DS3D_IMMEDIATE)
+ {
+ This->ds3db_need_recalc = FALSE;
+ DSOUND_Mix3DBuffer(This);
+ }
+ This->ds3db_need_recalc = TRUE;
+ return DS_OK;
}
static HRESULT WINAPI IDirectSound3DBufferImpl_SetConeOutsideVolume(IDirectSound3DBuffer *iface,
LONG lConeOutsideVolume, DWORD dwApply)
{
- IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface;
- TRACE("setting: ConeOutsideVolume = %d; dwApply = %d\n", lConeOutsideVolume, dwApply);
- This->dsb->ds3db_ds3db.lConeOutsideVolume = lConeOutsideVolume;
- if (dwApply == DS3D_IMMEDIATE)
- {
- This->dsb->ds3db_need_recalc = FALSE;
- DSOUND_Mix3DBuffer(This->dsb);
- }
- This->dsb->ds3db_need_recalc = TRUE;
- return DS_OK;
+ IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface);
+
+ TRACE("setting: ConeOutsideVolume = %d; dwApply = %d\n", lConeOutsideVolume, dwApply);
+ This->ds3db_ds3db.lConeOutsideVolume = lConeOutsideVolume;
+ if (dwApply == DS3D_IMMEDIATE)
+ {
+ This->ds3db_need_recalc = FALSE;
+ DSOUND_Mix3DBuffer(This);
+ }
+ This->ds3db_need_recalc = TRUE;
+ return DS_OK;
}
static HRESULT WINAPI IDirectSound3DBufferImpl_SetMaxDistance(IDirectSound3DBuffer *iface,
D3DVALUE fMaxDistance, DWORD dwApply)
{
- IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface;
- TRACE("setting: MaxDistance = %f; dwApply = %d\n", fMaxDistance, dwApply);
- This->dsb->ds3db_ds3db.flMaxDistance = fMaxDistance;
- if (dwApply == DS3D_IMMEDIATE)
- {
- This->dsb->ds3db_need_recalc = FALSE;
- DSOUND_Mix3DBuffer(This->dsb);
- }
- This->dsb->ds3db_need_recalc = TRUE;
- return DS_OK;
+ IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface);
+
+ TRACE("setting: MaxDistance = %f; dwApply = %d\n", fMaxDistance, dwApply);
+ This->ds3db_ds3db.flMaxDistance = fMaxDistance;
+ if (dwApply == DS3D_IMMEDIATE)
+ {
+ This->ds3db_need_recalc = FALSE;
+ DSOUND_Mix3DBuffer(This);
+ }
+ This->ds3db_need_recalc = TRUE;
+ return DS_OK;
}
static HRESULT WINAPI IDirectSound3DBufferImpl_SetMinDistance(IDirectSound3DBuffer *iface,
D3DVALUE fMinDistance, DWORD dwApply)
{
- IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface;
- TRACE("setting: MinDistance = %f; dwApply = %d\n", fMinDistance, dwApply);
- This->dsb->ds3db_ds3db.flMinDistance = fMinDistance;
- if (dwApply == DS3D_IMMEDIATE)
- {
- This->dsb->ds3db_need_recalc = FALSE;
- DSOUND_Mix3DBuffer(This->dsb);
- }
- This->dsb->ds3db_need_recalc = TRUE;
- return DS_OK;
+ IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface);
+
+ TRACE("setting: MinDistance = %f; dwApply = %d\n", fMinDistance, dwApply);
+ This->ds3db_ds3db.flMinDistance = fMinDistance;
+ if (dwApply == DS3D_IMMEDIATE)
+ {
+ This->ds3db_need_recalc = FALSE;
+ DSOUND_Mix3DBuffer(This);
+ }
+ This->ds3db_need_recalc = TRUE;
+ return DS_OK;
}
static HRESULT WINAPI IDirectSound3DBufferImpl_SetMode(IDirectSound3DBuffer *iface, DWORD dwMode,
DWORD dwApply)
{
- IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface;
- TRACE("setting: Mode = %d; dwApply = %d\n", dwMode, dwApply);
- This->dsb->ds3db_ds3db.dwMode = dwMode;
- if (dwApply == DS3D_IMMEDIATE)
- {
- This->dsb->ds3db_need_recalc = FALSE;
- DSOUND_Mix3DBuffer(This->dsb);
- }
- This->dsb->ds3db_need_recalc = TRUE;
- return DS_OK;
+ IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface);
+
+ TRACE("setting: Mode = %d; dwApply = %d\n", dwMode, dwApply);
+ This->ds3db_ds3db.dwMode = dwMode;
+ if (dwApply == DS3D_IMMEDIATE)
+ {
+ This->ds3db_need_recalc = FALSE;
+ DSOUND_Mix3DBuffer(This);
+ }
+ This->ds3db_need_recalc = TRUE;
+ return DS_OK;
}
static HRESULT WINAPI IDirectSound3DBufferImpl_SetPosition(IDirectSound3DBuffer *iface, D3DVALUE x,
D3DVALUE y, D3DVALUE z, DWORD dwApply)
{
- IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface;
- TRACE("setting: Position vector = (%f,%f,%f); dwApply = %d\n", x, y, z, dwApply);
- This->dsb->ds3db_ds3db.vPosition.x = x;
- This->dsb->ds3db_ds3db.vPosition.y = y;
- This->dsb->ds3db_ds3db.vPosition.z = z;
- if (dwApply == DS3D_IMMEDIATE)
- {
- This->dsb->ds3db_need_recalc = FALSE;
- DSOUND_Mix3DBuffer(This->dsb);
- }
- This->dsb->ds3db_need_recalc = TRUE;
- return DS_OK;
+ IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface);
+
+ TRACE("setting: Position vector = (%f,%f,%f); dwApply = %d\n", x, y, z, dwApply);
+ This->ds3db_ds3db.vPosition.x = x;
+ This->ds3db_ds3db.vPosition.y = y;
+ This->ds3db_ds3db.vPosition.z = z;
+ if (dwApply == DS3D_IMMEDIATE)
+ {
+ This->ds3db_need_recalc = FALSE;
+ DSOUND_Mix3DBuffer(This);
+ }
+ This->ds3db_need_recalc = TRUE;
+ return DS_OK;
}
static HRESULT WINAPI IDirectSound3DBufferImpl_SetVelocity(IDirectSound3DBuffer *iface,
D3DVALUE x, D3DVALUE y, D3DVALUE z, DWORD dwApply)
{
- IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface;
- TRACE("setting: Velocity vector = (%f,%f,%f); dwApply = %d\n", x, y, z, dwApply);
- This->dsb->ds3db_ds3db.vVelocity.x = x;
- This->dsb->ds3db_ds3db.vVelocity.y = y;
- This->dsb->ds3db_ds3db.vVelocity.z = z;
- if (dwApply == DS3D_IMMEDIATE)
- {
- This->dsb->ds3db_need_recalc = FALSE;
- DSOUND_Mix3DBuffer(This->dsb);
- }
- This->dsb->ds3db_need_recalc = TRUE;
- return DS_OK;
+ IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface);
+
+ TRACE("setting: Velocity vector = (%f,%f,%f); dwApply = %d\n", x, y, z, dwApply);
+ This->ds3db_ds3db.vVelocity.x = x;
+ This->ds3db_ds3db.vVelocity.y = y;
+ This->ds3db_ds3db.vVelocity.z = z;
+ if (dwApply == DS3D_IMMEDIATE)
+ {
+ This->ds3db_need_recalc = FALSE;
+ DSOUND_Mix3DBuffer(This);
+ }
+ This->ds3db_need_recalc = TRUE;
+ return DS_OK;
}
-static const IDirectSound3DBufferVtbl ds3dbvt =
+const IDirectSound3DBufferVtbl ds3dbvt =
{
/* IUnknown methods */
IDirectSound3DBufferImpl_QueryInterface,
@@ -648,57 +662,6 @@ static const IDirectSound3DBufferVtbl ds3dbvt =
IDirectSound3DBufferImpl_SetVelocity,
};
-HRESULT IDirectSound3DBufferImpl_Create(
- IDirectSoundBufferImpl *dsb,
- IDirectSound3DBufferImpl **pds3db)
-{
- IDirectSound3DBufferImpl *ds3db;
- TRACE("(%p,%p)\n",dsb,pds3db);
-
- ds3db = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(*ds3db));
-
- if (ds3db == NULL) {
- WARN("out of memory\n");
- *pds3db = 0;
- return DSERR_OUTOFMEMORY;
- }
-
- ds3db->ref = 0;
- ds3db->dsb = dsb;
- ds3db->lpVtbl = &ds3dbvt;
-
- ds3db->dsb->ds3db_ds3db.dwSize = sizeof(DS3DBUFFER);
- ds3db->dsb->ds3db_ds3db.vPosition.x = 0.0;
- ds3db->dsb->ds3db_ds3db.vPosition.y = 0.0;
- ds3db->dsb->ds3db_ds3db.vPosition.z = 0.0;
- ds3db->dsb->ds3db_ds3db.vVelocity.x = 0.0;
- ds3db->dsb->ds3db_ds3db.vVelocity.y = 0.0;
- ds3db->dsb->ds3db_ds3db.vVelocity.z = 0.0;
- ds3db->dsb->ds3db_ds3db.dwInsideConeAngle = DS3D_DEFAULTCONEANGLE;
- ds3db->dsb->ds3db_ds3db.dwOutsideConeAngle = DS3D_DEFAULTCONEANGLE;
- ds3db->dsb->ds3db_ds3db.vConeOrientation.x = 0.0;
- ds3db->dsb->ds3db_ds3db.vConeOrientation.y = 0.0;
- ds3db->dsb->ds3db_ds3db.vConeOrientation.z = 0.0;
- ds3db->dsb->ds3db_ds3db.lConeOutsideVolume = DS3D_DEFAULTCONEOUTSIDEVOLUME;
- ds3db->dsb->ds3db_ds3db.flMinDistance = DS3D_DEFAULTMINDISTANCE;
- ds3db->dsb->ds3db_ds3db.flMaxDistance = DS3D_DEFAULTMAXDISTANCE;
- ds3db->dsb->ds3db_ds3db.dwMode = DS3DMODE_NORMAL;
-
- ds3db->dsb->ds3db_need_recalc = TRUE;
-
- *pds3db = ds3db;
- return S_OK;
-}
-
-HRESULT IDirectSound3DBufferImpl_Destroy(
- IDirectSound3DBufferImpl *pds3db)
-{
- TRACE("(%p)\n",pds3db);
-
- while (IDirectSound3DBufferImpl_Release((LPDIRECTSOUND3DBUFFER)pds3db) > 0);
-
- return S_OK;
-}
/*******************************************************************************
* IDirectSound3DListener
--
1.7.4.4
More information about the wine-patches
mailing list