Module: wine Branch: master Commit: 5b5f00d5523d8a47dfcc0985425ef4850c3a69dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b5f00d5523d8a47dfcc098542...
Author: Francois Gouget fgouget@free.fr Date: Wed Dec 2 12:12:47 2009 +0100
dsound: Make some capture functions static.
---
dlls/dsound/capture.c | 12 ++++++------ dlls/dsound/dsound_private.h | 22 ---------------------- 2 files changed, 6 insertions(+), 28 deletions(-)
diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 29d9f40..26c86b8 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -821,7 +821,7 @@ DSOUND_capture_callback(HWAVEIN hwi, UINT msg, DWORD_PTR dwUser, DWORD_PTR dw1, TRACE("completed\n"); }
-HRESULT IDirectSoundCaptureBufferImpl_Create( +static HRESULT IDirectSoundCaptureBufferImpl_Create( DirectSoundCaptureDevice *device, IDirectSoundCaptureBufferImpl ** ppobj, LPCDSCBUFFERDESC lpcDSCBufferDesc) @@ -1006,7 +1006,7 @@ static HRESULT DirectSoundCaptureDevice_Create( return DS_OK; }
-ULONG DirectSoundCaptureDevice_Release( +static ULONG DirectSoundCaptureDevice_Release( DirectSoundCaptureDevice * device) { ULONG ref = InterlockedDecrement(&(device->ref)); @@ -1033,7 +1033,7 @@ ULONG DirectSoundCaptureDevice_Release( return ref; }
-HRESULT DirectSoundCaptureDevice_Initialize( +static HRESULT DirectSoundCaptureDevice_Initialize( DirectSoundCaptureDevice ** ppDevice, LPCGUID lpcGUID) { @@ -1221,7 +1221,7 @@ IDirectSoundCaptureImpl_Release( LPDIRECTSOUNDCAPTURE iface ) return ref; }
-HRESULT WINAPI IDirectSoundCaptureImpl_CreateCaptureBuffer( +static HRESULT WINAPI IDirectSoundCaptureImpl_CreateCaptureBuffer( LPDIRECTSOUNDCAPTURE iface, LPCDSCBUFFERDESC lpcDSCBufferDesc, LPDIRECTSOUNDCAPTUREBUFFER* lplpDSCaptureBuffer, @@ -1262,7 +1262,7 @@ HRESULT WINAPI IDirectSoundCaptureImpl_CreateCaptureBuffer( return hr; }
-HRESULT WINAPI IDirectSoundCaptureImpl_GetCaps( +static HRESULT WINAPI IDirectSoundCaptureImpl_GetCaps( LPDIRECTSOUNDCAPTURE iface, LPDSCCAPS lpDSCCaps ) { @@ -1294,7 +1294,7 @@ HRESULT WINAPI IDirectSoundCaptureImpl_GetCaps( return DS_OK; }
-HRESULT WINAPI IDirectSoundCaptureImpl_Initialize( +static HRESULT WINAPI IDirectSoundCaptureImpl_Initialize( LPDIRECTSOUNDCAPTURE iface, LPCGUID lpcGUID ) { diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 4a095c7..d52d697 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -273,12 +273,6 @@ struct DirectSoundCaptureDevice CRITICAL_SECTION lock; };
-HRESULT DirectSoundCaptureDevice_Initialize( - DirectSoundCaptureDevice ** ppDevice, - LPCGUID lpcGUID); -ULONG DirectSoundCaptureDevice_Release( - DirectSoundCaptureDevice * device); - /***************************************************************************** * IDirectSoundCaptureBuffer implementation structure */ @@ -301,11 +295,6 @@ struct IDirectSoundCaptureBufferImpl PIDSDRIVERNOTIFY hwnotify; };
-HRESULT IDirectSoundCaptureBufferImpl_Create( - DirectSoundCaptureDevice *device, - IDirectSoundCaptureBufferImpl ** ppobj, - LPCDSCBUFFERDESC lpcDSCBufferDesc); - /***************************************************************************** * IDirectSound3DListener implementation structure */ @@ -416,17 +405,6 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb);
HRESULT DSOUND_CaptureCreate(REFIID riid, LPDIRECTSOUNDCAPTURE *ppDSC); HRESULT DSOUND_CaptureCreate8(REFIID riid, LPDIRECTSOUNDCAPTURE8 *ppDSC8); -HRESULT WINAPI IDirectSoundCaptureImpl_CreateCaptureBuffer( - LPDIRECTSOUNDCAPTURE iface, - LPCDSCBUFFERDESC lpcDSCBufferDesc, - LPDIRECTSOUNDCAPTUREBUFFER* lplpDSCaptureBuffer, - LPUNKNOWN pUnk); -HRESULT WINAPI IDirectSoundCaptureImpl_GetCaps( - LPDIRECTSOUNDCAPTURE iface, - LPDSCCAPS lpDSCCaps); -HRESULT WINAPI IDirectSoundCaptureImpl_Initialize( - LPDIRECTSOUNDCAPTURE iface, - LPCGUID lpcGUID);
#define STATE_STOPPED 0 #define STATE_STARTING 1