dsound: Make some functions static.
This commit is contained in:
parent
241abf4e1b
commit
179a4e0a2e
|
@ -36,9 +36,24 @@
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(dsound);
|
WINE_DEFAULT_DEBUG_CHANNEL(dsound);
|
||||||
|
|
||||||
|
static HRESULT SecondaryBufferImpl_Destroy(SecondaryBufferImpl *pdsb);
|
||||||
|
|
||||||
/*******************************************************************************
|
/*******************************************************************************
|
||||||
* IDirectSoundNotify
|
* IDirectSoundNotify
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
struct IDirectSoundNotifyImpl
|
||||||
|
{
|
||||||
|
/* IUnknown fields */
|
||||||
|
const IDirectSoundNotifyVtbl *lpVtbl;
|
||||||
|
LONG ref;
|
||||||
|
IDirectSoundBufferImpl* dsb;
|
||||||
|
};
|
||||||
|
|
||||||
|
static HRESULT IDirectSoundNotifyImpl_Create(IDirectSoundBufferImpl *dsb,
|
||||||
|
IDirectSoundNotifyImpl **pdsn);
|
||||||
|
static HRESULT IDirectSoundNotifyImpl_Destroy(IDirectSoundNotifyImpl *pdsn);
|
||||||
|
|
||||||
static HRESULT WINAPI IDirectSoundNotifyImpl_QueryInterface(
|
static HRESULT WINAPI IDirectSoundNotifyImpl_QueryInterface(
|
||||||
LPDIRECTSOUNDNOTIFY iface,REFIID riid,LPVOID *ppobj
|
LPDIRECTSOUNDNOTIFY iface,REFIID riid,LPVOID *ppobj
|
||||||
) {
|
) {
|
||||||
|
@ -133,7 +148,7 @@ static const IDirectSoundNotifyVtbl dsnvt =
|
||||||
IDirectSoundNotifyImpl_SetNotificationPositions,
|
IDirectSoundNotifyImpl_SetNotificationPositions,
|
||||||
};
|
};
|
||||||
|
|
||||||
HRESULT IDirectSoundNotifyImpl_Create(
|
static HRESULT IDirectSoundNotifyImpl_Create(
|
||||||
IDirectSoundBufferImpl * dsb,
|
IDirectSoundBufferImpl * dsb,
|
||||||
IDirectSoundNotifyImpl **pdsn)
|
IDirectSoundNotifyImpl **pdsn)
|
||||||
{
|
{
|
||||||
|
@ -157,7 +172,7 @@ HRESULT IDirectSoundNotifyImpl_Create(
|
||||||
return DS_OK;
|
return DS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
HRESULT IDirectSoundNotifyImpl_Destroy(
|
static HRESULT IDirectSoundNotifyImpl_Destroy(
|
||||||
IDirectSoundNotifyImpl *pdsn)
|
IDirectSoundNotifyImpl *pdsn)
|
||||||
{
|
{
|
||||||
TRACE("(%p)\n",pdsn);
|
TRACE("(%p)\n",pdsn);
|
||||||
|
@ -1613,7 +1628,7 @@ HRESULT SecondaryBufferImpl_Create(
|
||||||
return S_OK;
|
return S_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
HRESULT SecondaryBufferImpl_Destroy(
|
static HRESULT SecondaryBufferImpl_Destroy(
|
||||||
SecondaryBufferImpl *pdsb)
|
SecondaryBufferImpl *pdsb)
|
||||||
{
|
{
|
||||||
TRACE("(%p)\n",pdsb);
|
TRACE("(%p)\n",pdsb);
|
||||||
|
|
|
@ -44,6 +44,36 @@
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(dsound);
|
WINE_DEFAULT_DEBUG_CHANNEL(dsound);
|
||||||
|
|
||||||
|
/*****************************************************************************
|
||||||
|
* IDirectSoundCapture implementation structure
|
||||||
|
*/
|
||||||
|
struct IDirectSoundCaptureImpl
|
||||||
|
{
|
||||||
|
/* IUnknown fields */
|
||||||
|
const IDirectSoundCaptureVtbl *lpVtbl;
|
||||||
|
LONG ref;
|
||||||
|
|
||||||
|
DirectSoundCaptureDevice *device;
|
||||||
|
};
|
||||||
|
|
||||||
|
static HRESULT IDirectSoundCaptureImpl_Create(LPDIRECTSOUNDCAPTURE8 * ppds);
|
||||||
|
|
||||||
|
|
||||||
|
/*****************************************************************************
|
||||||
|
* IDirectSoundCaptureNotify implementation structure
|
||||||
|
*/
|
||||||
|
struct IDirectSoundCaptureNotifyImpl
|
||||||
|
{
|
||||||
|
/* IUnknown fields */
|
||||||
|
const IDirectSoundNotifyVtbl *lpVtbl;
|
||||||
|
LONG ref;
|
||||||
|
IDirectSoundCaptureBufferImpl* dscb;
|
||||||
|
};
|
||||||
|
|
||||||
|
static HRESULT IDirectSoundCaptureNotifyImpl_Create(IDirectSoundCaptureBufferImpl *dscb,
|
||||||
|
IDirectSoundCaptureNotifyImpl ** pdscn);
|
||||||
|
|
||||||
|
|
||||||
DirectSoundCaptureDevice * DSOUND_capture[MAXWAVEDRIVERS];
|
DirectSoundCaptureDevice * DSOUND_capture[MAXWAVEDRIVERS];
|
||||||
|
|
||||||
static HRESULT DirectSoundCaptureDevice_Create(DirectSoundCaptureDevice ** ppDevice);
|
static HRESULT DirectSoundCaptureDevice_Create(DirectSoundCaptureDevice ** ppDevice);
|
||||||
|
@ -550,7 +580,7 @@ static const IDirectSoundCaptureVtbl dscvt =
|
||||||
IDirectSoundCaptureImpl_Initialize
|
IDirectSoundCaptureImpl_Initialize
|
||||||
};
|
};
|
||||||
|
|
||||||
HRESULT IDirectSoundCaptureImpl_Create(
|
static HRESULT IDirectSoundCaptureImpl_Create(
|
||||||
LPDIRECTSOUNDCAPTURE8 * ppDSC)
|
LPDIRECTSOUNDCAPTURE8 * ppDSC)
|
||||||
{
|
{
|
||||||
IDirectSoundCaptureImpl *pDSC;
|
IDirectSoundCaptureImpl *pDSC;
|
||||||
|
@ -676,7 +706,7 @@ static const IDirectSoundNotifyVtbl dscnvt =
|
||||||
IDirectSoundCaptureNotifyImpl_SetNotificationPositions,
|
IDirectSoundCaptureNotifyImpl_SetNotificationPositions,
|
||||||
};
|
};
|
||||||
|
|
||||||
HRESULT IDirectSoundCaptureNotifyImpl_Create(
|
static HRESULT IDirectSoundCaptureNotifyImpl_Create(
|
||||||
IDirectSoundCaptureBufferImpl *dscb,
|
IDirectSoundCaptureBufferImpl *dscb,
|
||||||
IDirectSoundCaptureNotifyImpl **pdscn)
|
IDirectSoundCaptureNotifyImpl **pdscn)
|
||||||
{
|
{
|
||||||
|
|
|
@ -39,11 +39,74 @@
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(dsound);
|
WINE_DEFAULT_DEBUG_CHANNEL(dsound);
|
||||||
|
|
||||||
|
/*****************************************************************************
|
||||||
|
* IDirectSound COM components
|
||||||
|
*/
|
||||||
|
struct IDirectSound_IUnknown {
|
||||||
|
const IUnknownVtbl *lpVtbl;
|
||||||
|
LONG ref;
|
||||||
|
LPDIRECTSOUND8 pds;
|
||||||
|
};
|
||||||
|
|
||||||
|
static HRESULT IDirectSound_IUnknown_Create(LPDIRECTSOUND8 pds, LPUNKNOWN * ppunk);
|
||||||
|
|
||||||
|
struct IDirectSound_IDirectSound {
|
||||||
|
const IDirectSoundVtbl *lpVtbl;
|
||||||
|
LONG ref;
|
||||||
|
LPDIRECTSOUND8 pds;
|
||||||
|
};
|
||||||
|
|
||||||
|
static HRESULT IDirectSound_IDirectSound_Create(LPDIRECTSOUND8 pds, LPDIRECTSOUND * ppds);
|
||||||
|
|
||||||
|
/*****************************************************************************
|
||||||
|
* IDirectSound8 COM components
|
||||||
|
*/
|
||||||
|
struct IDirectSound8_IUnknown {
|
||||||
|
const IUnknownVtbl *lpVtbl;
|
||||||
|
LONG ref;
|
||||||
|
LPDIRECTSOUND8 pds;
|
||||||
|
};
|
||||||
|
|
||||||
|
static HRESULT IDirectSound8_IUnknown_Create(LPDIRECTSOUND8 pds, LPUNKNOWN * ppunk);
|
||||||
|
static ULONG WINAPI IDirectSound8_IUnknown_AddRef(LPUNKNOWN iface);
|
||||||
|
|
||||||
|
struct IDirectSound8_IDirectSound {
|
||||||
|
const IDirectSoundVtbl *lpVtbl;
|
||||||
|
LONG ref;
|
||||||
|
LPDIRECTSOUND8 pds;
|
||||||
|
};
|
||||||
|
|
||||||
|
static HRESULT IDirectSound8_IDirectSound_Create(LPDIRECTSOUND8 pds, LPDIRECTSOUND * ppds);
|
||||||
|
static ULONG WINAPI IDirectSound8_IDirectSound_AddRef(LPDIRECTSOUND iface);
|
||||||
|
|
||||||
|
struct IDirectSound8_IDirectSound8 {
|
||||||
|
const IDirectSound8Vtbl *lpVtbl;
|
||||||
|
LONG ref;
|
||||||
|
LPDIRECTSOUND8 pds;
|
||||||
|
};
|
||||||
|
|
||||||
|
static HRESULT IDirectSound8_IDirectSound8_Create(LPDIRECTSOUND8 pds, LPDIRECTSOUND8 * ppds);
|
||||||
|
static ULONG WINAPI IDirectSound8_IDirectSound8_AddRef(LPDIRECTSOUND8 iface);
|
||||||
|
|
||||||
|
/*****************************************************************************
|
||||||
|
* IDirectSound implementation structure
|
||||||
|
*/
|
||||||
|
struct IDirectSoundImpl
|
||||||
|
{
|
||||||
|
LONG ref;
|
||||||
|
|
||||||
|
DirectSoundDevice *device;
|
||||||
|
LPUNKNOWN pUnknown;
|
||||||
|
LPDIRECTSOUND pDS;
|
||||||
|
LPDIRECTSOUND8 pDS8;
|
||||||
|
};
|
||||||
|
|
||||||
|
static HRESULT IDirectSoundImpl_Create(LPDIRECTSOUND8 * ppds);
|
||||||
|
|
||||||
static ULONG WINAPI IDirectSound_IUnknown_AddRef(LPUNKNOWN iface);
|
static ULONG WINAPI IDirectSound_IUnknown_AddRef(LPUNKNOWN iface);
|
||||||
static ULONG WINAPI IDirectSound_IDirectSound_AddRef(LPDIRECTSOUND iface);
|
static ULONG WINAPI IDirectSound_IDirectSound_AddRef(LPDIRECTSOUND iface);
|
||||||
static ULONG WINAPI IDirectSound8_IUnknown_AddRef(LPUNKNOWN iface);
|
|
||||||
static ULONG WINAPI IDirectSound8_IDirectSound_AddRef(LPDIRECTSOUND iface);
|
static HRESULT DirectSoundDevice_VerifyCertification(DirectSoundDevice * device, LPDWORD pdwCertified);
|
||||||
static ULONG WINAPI IDirectSound8_IDirectSound8_AddRef(LPDIRECTSOUND8 iface);
|
|
||||||
|
|
||||||
const char * dumpCooperativeLevel(DWORD level)
|
const char * dumpCooperativeLevel(DWORD level)
|
||||||
{
|
{
|
||||||
|
@ -242,7 +305,7 @@ static ULONG IDirectSoundImpl_Release(
|
||||||
return ref;
|
return ref;
|
||||||
}
|
}
|
||||||
|
|
||||||
HRESULT IDirectSoundImpl_Create(
|
static HRESULT IDirectSoundImpl_Create(
|
||||||
LPDIRECTSOUND8 * ppDS)
|
LPDIRECTSOUND8 * ppDS)
|
||||||
{
|
{
|
||||||
IDirectSoundImpl* pDS;
|
IDirectSoundImpl* pDS;
|
||||||
|
@ -307,7 +370,7 @@ static const IUnknownVtbl DirectSound_Unknown_Vtbl =
|
||||||
IDirectSound_IUnknown_Release
|
IDirectSound_IUnknown_Release
|
||||||
};
|
};
|
||||||
|
|
||||||
HRESULT IDirectSound_IUnknown_Create(
|
static HRESULT IDirectSound_IUnknown_Create(
|
||||||
LPDIRECTSOUND8 pds,
|
LPDIRECTSOUND8 pds,
|
||||||
LPUNKNOWN * ppunk)
|
LPUNKNOWN * ppunk)
|
||||||
{
|
{
|
||||||
|
@ -468,7 +531,7 @@ static const IDirectSoundVtbl DirectSound_DirectSound_Vtbl =
|
||||||
IDirectSound_IDirectSound_Initialize
|
IDirectSound_IDirectSound_Initialize
|
||||||
};
|
};
|
||||||
|
|
||||||
HRESULT IDirectSound_IDirectSound_Create(
|
static HRESULT IDirectSound_IDirectSound_Create(
|
||||||
LPDIRECTSOUND8 pds,
|
LPDIRECTSOUND8 pds,
|
||||||
LPDIRECTSOUND * ppds)
|
LPDIRECTSOUND * ppds)
|
||||||
{
|
{
|
||||||
|
@ -546,7 +609,7 @@ static const IUnknownVtbl DirectSound8_Unknown_Vtbl =
|
||||||
IDirectSound8_IUnknown_Release
|
IDirectSound8_IUnknown_Release
|
||||||
};
|
};
|
||||||
|
|
||||||
HRESULT IDirectSound8_IUnknown_Create(
|
static HRESULT IDirectSound8_IUnknown_Create(
|
||||||
LPDIRECTSOUND8 pds,
|
LPDIRECTSOUND8 pds,
|
||||||
LPUNKNOWN * ppunk)
|
LPUNKNOWN * ppunk)
|
||||||
{
|
{
|
||||||
|
@ -707,7 +770,7 @@ static const IDirectSoundVtbl DirectSound8_DirectSound_Vtbl =
|
||||||
IDirectSound8_IDirectSound_Initialize
|
IDirectSound8_IDirectSound_Initialize
|
||||||
};
|
};
|
||||||
|
|
||||||
HRESULT IDirectSound8_IDirectSound_Create(
|
static HRESULT IDirectSound8_IDirectSound_Create(
|
||||||
LPDIRECTSOUND8 pds,
|
LPDIRECTSOUND8 pds,
|
||||||
LPDIRECTSOUND * ppds)
|
LPDIRECTSOUND * ppds)
|
||||||
{
|
{
|
||||||
|
@ -878,7 +941,7 @@ static const IDirectSound8Vtbl DirectSound8_DirectSound8_Vtbl =
|
||||||
IDirectSound8_IDirectSound8_VerifyCertification
|
IDirectSound8_IDirectSound8_VerifyCertification
|
||||||
};
|
};
|
||||||
|
|
||||||
HRESULT IDirectSound8_IDirectSound8_Create(
|
static HRESULT IDirectSound8_IDirectSound8_Create(
|
||||||
LPDIRECTSOUND8 pds,
|
LPDIRECTSOUND8 pds,
|
||||||
LPDIRECTSOUND8 * ppds)
|
LPDIRECTSOUND8 * ppds)
|
||||||
{
|
{
|
||||||
|
@ -1078,7 +1141,7 @@ HRESULT WINAPI DirectSoundCreate8(
|
||||||
/*******************************************************************************
|
/*******************************************************************************
|
||||||
* DirectSoundDevice
|
* DirectSoundDevice
|
||||||
*/
|
*/
|
||||||
HRESULT DirectSoundDevice_Create(DirectSoundDevice ** ppDevice)
|
static HRESULT DirectSoundDevice_Create(DirectSoundDevice ** ppDevice)
|
||||||
{
|
{
|
||||||
DirectSoundDevice * device;
|
DirectSoundDevice * device;
|
||||||
TRACE("(%p)\n", ppDevice);
|
TRACE("(%p)\n", ppDevice);
|
||||||
|
@ -1158,7 +1221,7 @@ HRESULT DirectSoundDevice_Create(DirectSoundDevice ** ppDevice)
|
||||||
return DS_OK;
|
return DS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
ULONG DirectSoundDevice_AddRef(DirectSoundDevice * device)
|
static ULONG DirectSoundDevice_AddRef(DirectSoundDevice * device)
|
||||||
{
|
{
|
||||||
ULONG ref = InterlockedIncrement(&(device->ref));
|
ULONG ref = InterlockedIncrement(&(device->ref));
|
||||||
TRACE("(%p) ref was %ld\n", device, ref - 1);
|
TRACE("(%p) ref was %ld\n", device, ref - 1);
|
||||||
|
@ -1678,7 +1741,7 @@ HRESULT DirectSoundDevice_SetSpeakerConfig(
|
||||||
return DS_OK;
|
return DS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
HRESULT DirectSoundDevice_VerifyCertification(
|
static HRESULT DirectSoundDevice_VerifyCertification(
|
||||||
DirectSoundDevice * device,
|
DirectSoundDevice * device,
|
||||||
LPDWORD pdwCertified)
|
LPDWORD pdwCertified)
|
||||||
{
|
{
|
||||||
|
|
|
@ -226,7 +226,7 @@ void setup_dsound_options(void)
|
||||||
WARN("ds_default_bits_per_sample = %d (default=8)\n",ds_default_bits_per_sample);
|
WARN("ds_default_bits_per_sample = %d (default=8)\n",ds_default_bits_per_sample);
|
||||||
}
|
}
|
||||||
|
|
||||||
const char * get_device_id(LPCGUID pGuid)
|
static const char * get_device_id(LPCGUID pGuid)
|
||||||
{
|
{
|
||||||
if (IsEqualGUID(&DSDEVID_DefaultPlayback, pGuid))
|
if (IsEqualGUID(&DSDEVID_DefaultPlayback, pGuid))
|
||||||
return "DSDEVID_DefaultPlayback";
|
return "DSDEVID_DefaultPlayback";
|
||||||
|
|
|
@ -72,22 +72,6 @@ typedef struct IClassFactoryImpl IClassFactoryImpl;
|
||||||
typedef struct DirectSoundDevice DirectSoundDevice;
|
typedef struct DirectSoundDevice DirectSoundDevice;
|
||||||
typedef struct DirectSoundCaptureDevice DirectSoundCaptureDevice;
|
typedef struct DirectSoundCaptureDevice DirectSoundCaptureDevice;
|
||||||
|
|
||||||
/*****************************************************************************
|
|
||||||
* IDirectSound implementation structure
|
|
||||||
*/
|
|
||||||
struct IDirectSoundImpl
|
|
||||||
{
|
|
||||||
LONG ref;
|
|
||||||
|
|
||||||
DirectSoundDevice *device;
|
|
||||||
LPUNKNOWN pUnknown;
|
|
||||||
LPDIRECTSOUND pDS;
|
|
||||||
LPDIRECTSOUND8 pDS8;
|
|
||||||
};
|
|
||||||
|
|
||||||
HRESULT IDirectSoundImpl_Create(
|
|
||||||
LPDIRECTSOUND8 * ppds);
|
|
||||||
|
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* IDirectSoundDevice implementation structure
|
* IDirectSoundDevice implementation structure
|
||||||
*/
|
*/
|
||||||
|
@ -132,8 +116,6 @@ typedef struct BufferMemory
|
||||||
LPBYTE memory;
|
LPBYTE memory;
|
||||||
} BufferMemory;
|
} BufferMemory;
|
||||||
|
|
||||||
HRESULT DirectSoundDevice_Create(DirectSoundDevice ** ppDevice);
|
|
||||||
ULONG DirectSoundDevice_AddRef(DirectSoundDevice * device);
|
|
||||||
ULONG DirectSoundDevice_Release(DirectSoundDevice * device);
|
ULONG DirectSoundDevice_Release(DirectSoundDevice * device);
|
||||||
HRESULT DirectSoundDevice_Initialize(
|
HRESULT DirectSoundDevice_Initialize(
|
||||||
DirectSoundDevice ** ppDevice,
|
DirectSoundDevice ** ppDevice,
|
||||||
|
@ -166,65 +148,6 @@ HRESULT DirectSoundDevice_GetSpeakerConfig(
|
||||||
HRESULT DirectSoundDevice_SetSpeakerConfig(
|
HRESULT DirectSoundDevice_SetSpeakerConfig(
|
||||||
DirectSoundDevice * device,
|
DirectSoundDevice * device,
|
||||||
DWORD config);
|
DWORD config);
|
||||||
HRESULT DirectSoundDevice_VerifyCertification(
|
|
||||||
DirectSoundDevice * device,
|
|
||||||
LPDWORD pdwCertified);
|
|
||||||
|
|
||||||
/*****************************************************************************
|
|
||||||
* IDirectSound COM components
|
|
||||||
*/
|
|
||||||
struct IDirectSound_IUnknown {
|
|
||||||
const IUnknownVtbl *lpVtbl;
|
|
||||||
LONG ref;
|
|
||||||
LPDIRECTSOUND8 pds;
|
|
||||||
};
|
|
||||||
|
|
||||||
HRESULT IDirectSound_IUnknown_Create(
|
|
||||||
LPDIRECTSOUND8 pds,
|
|
||||||
LPUNKNOWN * ppunk);
|
|
||||||
|
|
||||||
struct IDirectSound_IDirectSound {
|
|
||||||
const IDirectSoundVtbl *lpVtbl;
|
|
||||||
LONG ref;
|
|
||||||
LPDIRECTSOUND8 pds;
|
|
||||||
};
|
|
||||||
|
|
||||||
HRESULT IDirectSound_IDirectSound_Create(
|
|
||||||
LPDIRECTSOUND8 pds,
|
|
||||||
LPDIRECTSOUND * ppds);
|
|
||||||
|
|
||||||
/*****************************************************************************
|
|
||||||
* IDirectSound8 COM components
|
|
||||||
*/
|
|
||||||
struct IDirectSound8_IUnknown {
|
|
||||||
const IUnknownVtbl *lpVtbl;
|
|
||||||
LONG ref;
|
|
||||||
LPDIRECTSOUND8 pds;
|
|
||||||
};
|
|
||||||
|
|
||||||
HRESULT IDirectSound8_IUnknown_Create(
|
|
||||||
LPDIRECTSOUND8 pds,
|
|
||||||
LPUNKNOWN * ppunk);
|
|
||||||
|
|
||||||
struct IDirectSound8_IDirectSound {
|
|
||||||
const IDirectSoundVtbl *lpVtbl;
|
|
||||||
LONG ref;
|
|
||||||
LPDIRECTSOUND8 pds;
|
|
||||||
};
|
|
||||||
|
|
||||||
HRESULT IDirectSound8_IDirectSound_Create(
|
|
||||||
LPDIRECTSOUND8 pds,
|
|
||||||
LPDIRECTSOUND * ppds);
|
|
||||||
|
|
||||||
struct IDirectSound8_IDirectSound8 {
|
|
||||||
const IDirectSound8Vtbl *lpVtbl;
|
|
||||||
LONG ref;
|
|
||||||
LPDIRECTSOUND8 pds;
|
|
||||||
};
|
|
||||||
|
|
||||||
HRESULT IDirectSound8_IDirectSound8_Create(
|
|
||||||
LPDIRECTSOUND8 pds,
|
|
||||||
LPDIRECTSOUND8 * ppds);
|
|
||||||
|
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* IDirectSoundBuffer implementation structure
|
* IDirectSoundBuffer implementation structure
|
||||||
|
@ -295,8 +218,6 @@ struct SecondaryBufferImpl
|
||||||
HRESULT SecondaryBufferImpl_Create(
|
HRESULT SecondaryBufferImpl_Create(
|
||||||
IDirectSoundBufferImpl *dsb,
|
IDirectSoundBufferImpl *dsb,
|
||||||
SecondaryBufferImpl **pdsb);
|
SecondaryBufferImpl **pdsb);
|
||||||
HRESULT SecondaryBufferImpl_Destroy(
|
|
||||||
SecondaryBufferImpl *pdsb);
|
|
||||||
|
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* PrimaryBuffer implementation structure
|
* PrimaryBuffer implementation structure
|
||||||
|
@ -313,21 +234,6 @@ HRESULT PrimaryBufferImpl_Create(
|
||||||
PrimaryBufferImpl **ppdsb,
|
PrimaryBufferImpl **ppdsb,
|
||||||
LPCDSBUFFERDESC dsbd);
|
LPCDSBUFFERDESC dsbd);
|
||||||
|
|
||||||
/*****************************************************************************
|
|
||||||
* IDirectSoundCapture implementation structure
|
|
||||||
*/
|
|
||||||
struct IDirectSoundCaptureImpl
|
|
||||||
{
|
|
||||||
/* IUnknown fields */
|
|
||||||
const IDirectSoundCaptureVtbl *lpVtbl;
|
|
||||||
LONG ref;
|
|
||||||
|
|
||||||
DirectSoundCaptureDevice *device;
|
|
||||||
};
|
|
||||||
|
|
||||||
HRESULT IDirectSoundCaptureImpl_Create(
|
|
||||||
LPDIRECTSOUNDCAPTURE8 * ppds);
|
|
||||||
|
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* DirectSoundCaptureDevice implementation structure
|
* DirectSoundCaptureDevice implementation structure
|
||||||
*/
|
*/
|
||||||
|
@ -440,38 +346,6 @@ struct IDirectSoundFullDuplex_IDirectSoundCapture {
|
||||||
IDirectSoundFullDuplexImpl *pdsfd;
|
IDirectSoundFullDuplexImpl *pdsfd;
|
||||||
};
|
};
|
||||||
|
|
||||||
/*****************************************************************************
|
|
||||||
* IDirectSoundNotify implementation structure
|
|
||||||
*/
|
|
||||||
struct IDirectSoundNotifyImpl
|
|
||||||
{
|
|
||||||
/* IUnknown fields */
|
|
||||||
const IDirectSoundNotifyVtbl *lpVtbl;
|
|
||||||
LONG ref;
|
|
||||||
IDirectSoundBufferImpl* dsb;
|
|
||||||
};
|
|
||||||
|
|
||||||
HRESULT IDirectSoundNotifyImpl_Create(
|
|
||||||
IDirectSoundBufferImpl *dsb,
|
|
||||||
IDirectSoundNotifyImpl **pdsn);
|
|
||||||
HRESULT IDirectSoundNotifyImpl_Destroy(
|
|
||||||
IDirectSoundNotifyImpl *pdsn);
|
|
||||||
|
|
||||||
/*****************************************************************************
|
|
||||||
* IDirectSoundCaptureNotify implementation structure
|
|
||||||
*/
|
|
||||||
struct IDirectSoundCaptureNotifyImpl
|
|
||||||
{
|
|
||||||
/* IUnknown fields */
|
|
||||||
const IDirectSoundNotifyVtbl *lpVtbl;
|
|
||||||
LONG ref;
|
|
||||||
IDirectSoundCaptureBufferImpl* dscb;
|
|
||||||
};
|
|
||||||
|
|
||||||
HRESULT IDirectSoundCaptureNotifyImpl_Create(
|
|
||||||
IDirectSoundCaptureBufferImpl *dscb,
|
|
||||||
IDirectSoundCaptureNotifyImpl ** pdscn);
|
|
||||||
|
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* IDirectSound3DListener implementation structure
|
* IDirectSound3DListener implementation structure
|
||||||
*/
|
*/
|
||||||
|
@ -577,7 +451,6 @@ void DSOUND_CheckEvent(IDirectSoundBufferImpl *dsb, int len);
|
||||||
void DSOUND_ForceRemix(IDirectSoundBufferImpl *dsb);
|
void DSOUND_ForceRemix(IDirectSoundBufferImpl *dsb);
|
||||||
void DSOUND_MixCancelAt(IDirectSoundBufferImpl *dsb, DWORD buf_writepos);
|
void DSOUND_MixCancelAt(IDirectSoundBufferImpl *dsb, DWORD buf_writepos);
|
||||||
void DSOUND_WaveQueue(DirectSoundDevice *device, DWORD mixq);
|
void DSOUND_WaveQueue(DirectSoundDevice *device, DWORD mixq);
|
||||||
void DSOUND_PerformMix(DirectSoundDevice *device);
|
|
||||||
void DSOUND_RecalcVolPan(PDSVOLUMEPAN volpan);
|
void DSOUND_RecalcVolPan(PDSVOLUMEPAN volpan);
|
||||||
void DSOUND_AmpFactorToVolPan(PDSVOLUMEPAN volpan);
|
void DSOUND_AmpFactorToVolPan(PDSVOLUMEPAN volpan);
|
||||||
void DSOUND_RecalcFormat(IDirectSoundBufferImpl *dsb);
|
void DSOUND_RecalcFormat(IDirectSoundBufferImpl *dsb);
|
||||||
|
@ -588,10 +461,6 @@ void CALLBACK DSOUND_callback(HWAVEOUT hwo, UINT msg, DWORD dwUser, DWORD dw1, D
|
||||||
|
|
||||||
void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb);
|
void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb);
|
||||||
|
|
||||||
/* duplex.c */
|
|
||||||
|
|
||||||
HRESULT DSOUND_FullDuplexCreate(LPDIRECTSOUNDFULLDUPLEX* ppDSFD, IUnknown *pUnkOuter);
|
|
||||||
|
|
||||||
/* capture.c */
|
/* capture.c */
|
||||||
|
|
||||||
HRESULT WINAPI IDirectSoundCaptureImpl_CreateCaptureBuffer(
|
HRESULT WINAPI IDirectSoundCaptureImpl_CreateCaptureBuffer(
|
||||||
|
@ -622,5 +491,4 @@ extern GUID DSOUND_capture_guids[MAXWAVEDRIVERS];
|
||||||
|
|
||||||
HRESULT mmErr(UINT err);
|
HRESULT mmErr(UINT err);
|
||||||
void setup_dsound_options(void);
|
void setup_dsound_options(void);
|
||||||
const char * get_device_id(LPCGUID pGuid);
|
|
||||||
const char * dumpCooperativeLevel(DWORD level);
|
const char * dumpCooperativeLevel(DWORD level);
|
||||||
|
|
|
@ -760,7 +760,7 @@ static const IDirectSoundFullDuplexVtbl dsfdvt =
|
||||||
IDirectSoundFullDuplexImpl_Initialize
|
IDirectSoundFullDuplexImpl_Initialize
|
||||||
};
|
};
|
||||||
|
|
||||||
HRESULT DSOUND_FullDuplexCreate(LPDIRECTSOUNDFULLDUPLEX* ppDSFD, IUnknown *pUnkOuter)
|
static HRESULT DSOUND_FullDuplexCreate(LPDIRECTSOUNDFULLDUPLEX* ppDSFD, IUnknown *pUnkOuter)
|
||||||
{
|
{
|
||||||
IDirectSoundFullDuplexImpl *This = NULL;
|
IDirectSoundFullDuplexImpl *This = NULL;
|
||||||
|
|
||||||
|
|
|
@ -941,7 +941,7 @@ void DSOUND_WaveQueue(DirectSoundDevice *device, DWORD mixq)
|
||||||
|
|
||||||
/* #define SYNC_CALLBACK */
|
/* #define SYNC_CALLBACK */
|
||||||
|
|
||||||
void DSOUND_PerformMix(DirectSoundDevice *device)
|
static void DSOUND_PerformMix(DirectSoundDevice *device)
|
||||||
{
|
{
|
||||||
int nfiller;
|
int nfiller;
|
||||||
BOOL forced;
|
BOOL forced;
|
||||||
|
|
|
@ -37,7 +37,7 @@
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(dsound);
|
WINE_DEFAULT_DEBUG_CHANNEL(dsound);
|
||||||
|
|
||||||
void DSOUND_RecalcPrimary(DirectSoundDevice *device)
|
static void DSOUND_RecalcPrimary(DirectSoundDevice *device)
|
||||||
{
|
{
|
||||||
DWORD nBlockAlign;
|
DWORD nBlockAlign;
|
||||||
TRACE("(%p)\n", device);
|
TRACE("(%p)\n", device);
|
||||||
|
|
Loading…
Reference in New Issue