dsound: Make the virtual table functions static where possible.
This commit is contained in:
parent
c44fc329f7
commit
bbeeea4b88
|
@ -46,6 +46,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(dsound);
|
||||||
|
|
||||||
DirectSoundCaptureDevice * DSOUND_capture[MAXWAVEDRIVERS];
|
DirectSoundCaptureDevice * DSOUND_capture[MAXWAVEDRIVERS];
|
||||||
|
|
||||||
|
static HRESULT DirectSoundCaptureDevice_Create(DirectSoundCaptureDevice ** ppDevice);
|
||||||
|
|
||||||
static const char * captureStateString[] = {
|
static const char * captureStateString[] = {
|
||||||
"STATE_STOPPED",
|
"STATE_STOPPED",
|
||||||
"STATE_STARTING",
|
"STATE_STARTING",
|
||||||
|
@ -1605,7 +1607,7 @@ HRESULT DirectSoundCaptureDevice_Initialize(
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
HRESULT DirectSoundCaptureDevice_Create(
|
static HRESULT DirectSoundCaptureDevice_Create(
|
||||||
DirectSoundCaptureDevice ** ppDevice)
|
DirectSoundCaptureDevice ** ppDevice)
|
||||||
{
|
{
|
||||||
DirectSoundCaptureDevice * device;
|
DirectSoundCaptureDevice * device;
|
||||||
|
|
|
@ -361,13 +361,9 @@ struct DirectSoundCaptureDevice
|
||||||
CRITICAL_SECTION lock;
|
CRITICAL_SECTION lock;
|
||||||
};
|
};
|
||||||
|
|
||||||
HRESULT DirectSoundCaptureDevice_Create(
|
|
||||||
DirectSoundCaptureDevice ** ppDevice);
|
|
||||||
HRESULT DirectSoundCaptureDevice_Initialize(
|
HRESULT DirectSoundCaptureDevice_Initialize(
|
||||||
DirectSoundCaptureDevice ** ppDevice,
|
DirectSoundCaptureDevice ** ppDevice,
|
||||||
LPCGUID lpcGUID);
|
LPCGUID lpcGUID);
|
||||||
ULONG DirectSoundCaptureDevice_AddRef(
|
|
||||||
DirectSoundCaptureDevice * device);
|
|
||||||
ULONG DirectSoundCaptureDevice_Release(
|
ULONG DirectSoundCaptureDevice_Release(
|
||||||
DirectSoundCaptureDevice * device);
|
DirectSoundCaptureDevice * device);
|
||||||
|
|
||||||
|
@ -426,40 +422,24 @@ struct IDirectSoundFullDuplex_IUnknown {
|
||||||
IDirectSoundFullDuplexImpl *pdsfd;
|
IDirectSoundFullDuplexImpl *pdsfd;
|
||||||
};
|
};
|
||||||
|
|
||||||
HRESULT IDirectSoundFullDuplex_IUnknown_Create(
|
|
||||||
LPDIRECTSOUNDFULLDUPLEX pdsfd,
|
|
||||||
LPUNKNOWN * ppunk);
|
|
||||||
|
|
||||||
struct IDirectSoundFullDuplex_IDirectSound {
|
struct IDirectSoundFullDuplex_IDirectSound {
|
||||||
const IDirectSoundVtbl *lpVtbl;
|
const IDirectSoundVtbl *lpVtbl;
|
||||||
LONG ref;
|
LONG ref;
|
||||||
IDirectSoundFullDuplexImpl *pdsfd;
|
IDirectSoundFullDuplexImpl *pdsfd;
|
||||||
};
|
};
|
||||||
|
|
||||||
HRESULT IDirectSoundFullDuplex_IDirectSound_Create(
|
|
||||||
LPDIRECTSOUNDFULLDUPLEX pdsfd,
|
|
||||||
LPDIRECTSOUND * ppds);
|
|
||||||
|
|
||||||
struct IDirectSoundFullDuplex_IDirectSound8 {
|
struct IDirectSoundFullDuplex_IDirectSound8 {
|
||||||
const IDirectSound8Vtbl *lpVtbl;
|
const IDirectSound8Vtbl *lpVtbl;
|
||||||
LONG ref;
|
LONG ref;
|
||||||
IDirectSoundFullDuplexImpl *pdsfd;
|
IDirectSoundFullDuplexImpl *pdsfd;
|
||||||
};
|
};
|
||||||
|
|
||||||
HRESULT IDirectSoundFullDuplex_IDirectSound8_Create(
|
|
||||||
LPDIRECTSOUNDFULLDUPLEX pdsfd,
|
|
||||||
LPDIRECTSOUND8 * ppds8);
|
|
||||||
|
|
||||||
struct IDirectSoundFullDuplex_IDirectSoundCapture {
|
struct IDirectSoundFullDuplex_IDirectSoundCapture {
|
||||||
const IDirectSoundCaptureVtbl *lpVtbl;
|
const IDirectSoundCaptureVtbl *lpVtbl;
|
||||||
LONG ref;
|
LONG ref;
|
||||||
IDirectSoundFullDuplexImpl *pdsfd;
|
IDirectSoundFullDuplexImpl *pdsfd;
|
||||||
};
|
};
|
||||||
|
|
||||||
HRESULT IDirectSoundFullDuplex_IDirectSoundCapture_Create(
|
|
||||||
LPDIRECTSOUNDFULLDUPLEX pdsfd,
|
|
||||||
LPDIRECTSOUNDCAPTURE8 * ppdsc8);
|
|
||||||
|
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* IDirectSoundNotify implementation structure
|
* IDirectSoundNotify implementation structure
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -82,7 +82,7 @@ static const IUnknownVtbl DirectSoundFullDuplex_Unknown_Vtbl =
|
||||||
IDirectSoundFullDuplex_IUnknown_Release
|
IDirectSoundFullDuplex_IUnknown_Release
|
||||||
};
|
};
|
||||||
|
|
||||||
HRESULT IDirectSoundFullDuplex_IUnknown_Create(
|
static HRESULT IDirectSoundFullDuplex_IUnknown_Create(
|
||||||
LPDIRECTSOUNDFULLDUPLEX pdsfd,
|
LPDIRECTSOUNDFULLDUPLEX pdsfd,
|
||||||
LPUNKNOWN * ppunk)
|
LPUNKNOWN * ppunk)
|
||||||
{
|
{
|
||||||
|
@ -241,7 +241,7 @@ static const IDirectSoundVtbl DirectSoundFullDuplex_DirectSound_Vtbl =
|
||||||
IDirectSoundFullDuplex_IDirectSound_Initialize
|
IDirectSoundFullDuplex_IDirectSound_Initialize
|
||||||
};
|
};
|
||||||
|
|
||||||
HRESULT IDirectSoundFullDuplex_IDirectSound_Create(
|
static HRESULT IDirectSoundFullDuplex_IDirectSound_Create(
|
||||||
LPDIRECTSOUNDFULLDUPLEX pdsfd,
|
LPDIRECTSOUNDFULLDUPLEX pdsfd,
|
||||||
LPDIRECTSOUND * ppds)
|
LPDIRECTSOUND * ppds)
|
||||||
{
|
{
|
||||||
|
@ -406,7 +406,7 @@ static const IDirectSound8Vtbl DirectSoundFullDuplex_DirectSound8_Vtbl =
|
||||||
IDirectSoundFullDuplex_IDirectSound8_Initialize
|
IDirectSoundFullDuplex_IDirectSound8_Initialize
|
||||||
};
|
};
|
||||||
|
|
||||||
HRESULT IDirectSoundFullDuplex_IDirectSound8_Create(
|
static HRESULT IDirectSoundFullDuplex_IDirectSound8_Create(
|
||||||
LPDIRECTSOUNDFULLDUPLEX pdsfd,
|
LPDIRECTSOUNDFULLDUPLEX pdsfd,
|
||||||
LPDIRECTSOUND8 * ppds8)
|
LPDIRECTSOUND8 * ppds8)
|
||||||
{
|
{
|
||||||
|
@ -520,7 +520,7 @@ static const IDirectSoundCaptureVtbl DirectSoundFullDuplex_DirectSoundCapture_Vt
|
||||||
IDirectSoundFullDuplex_IDirectSoundCapture_Initialize
|
IDirectSoundFullDuplex_IDirectSoundCapture_Initialize
|
||||||
};
|
};
|
||||||
|
|
||||||
HRESULT IDirectSoundFullDuplex_IDirectSoundCapture_Create(
|
static HRESULT IDirectSoundFullDuplex_IDirectSoundCapture_Create(
|
||||||
LPDIRECTSOUNDFULLDUPLEX pdsfd,
|
LPDIRECTSOUNDFULLDUPLEX pdsfd,
|
||||||
LPDIRECTSOUNDCAPTURE8 * ppdsc8)
|
LPDIRECTSOUNDCAPTURE8 * ppdsc8)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue