Skip to content

W
wine-winehq
Commit ebf33fff authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard
Browse files
Options

dsound: Move the capture structs declarations to the .c file.

parent d39801be
Show whitespace changes
Inline Side-by-side
Showing with 37 additions and 47 deletions
dlls/dsound/capture.c
View file @ ebf33fff
......@@ -43,6 +43,43 @@
WINE_DEFAULT_DEBUG_CHANNEL(dsound);
typedef struct DirectSoundCaptureDevice DirectSoundCaptureDevice;
/* IDirectSoundCaptureBuffer implementation structure */
typedef struct IDirectSoundCaptureBufferImpl
{
IDirectSoundCaptureBuffer8 IDirectSoundCaptureBuffer8_iface;
IDirectSoundNotify IDirectSoundNotify_iface;
LONG numIfaces; /* "in use interfaces" refcount */
LONG ref, refn;
/* IDirectSoundCaptureBuffer fields */
DirectSoundCaptureDevice *device;
DSCBUFFERDESC *pdscbd;
DWORD flags;
/* IDirectSoundNotify fields */
DSBPOSITIONNOTIFY *notifies;
int nrofnotifies;
} IDirectSoundCaptureBufferImpl;
/* DirectSoundCaptureDevice implementation structure */
struct DirectSoundCaptureDevice
{
GUID guid;
LONG ref;
DSCCAPS drvcaps;
BYTE *buffer;
DWORD buflen, write_pos_bytes;
WAVEFORMATEX *pwfx;
IDirectSoundCaptureBufferImpl *capture_buffer;
DWORD state;
UINT timerID;
CRITICAL_SECTION lock;
IMMDevice *mmdevice;
IAudioClient *client;
IAudioCaptureClient *capture;
struct list entry;
};
static void capturebuffer_destroy(IDirectSoundCaptureBufferImpl *This)
{
......
dlls/dsound/dsound_private.h
View file @ ebf33fff
......@@ -40,9 +40,7 @@ extern int ds_default_bits_per_sample DECLSPEC_HIDDEN;
* Predeclare the interface implementation structures
*/
typedef struct IDirectSoundBufferImpl IDirectSoundBufferImpl;
typedef struct IDirectSoundCaptureBufferImpl IDirectSoundCaptureBufferImpl;
typedef struct DirectSoundDevice DirectSoundDevice;
typedef struct DirectSoundCaptureDevice DirectSoundCaptureDevice;
/* dsound_convert.h */
typedef float (*bitsgetfunc)(const IDirectSoundBufferImpl *, DWORD, DWORD);
......@@ -209,51 +207,6 @@ const IDirectSound3DListenerVtbl ds3dlvt DECLSPEC_HIDDEN;
const IDirectSound3DBufferVtbl ds3dbvt DECLSPEC_HIDDEN;
const IKsPropertySetVtbl iksbvt DECLSPEC_HIDDEN;
/*****************************************************************************
* DirectSoundCaptureDevice implementation structure
*/
struct DirectSoundCaptureDevice
{
GUID guid;
LONG ref;
DSCCAPS drvcaps;
LPBYTE buffer;
DWORD buflen, write_pos_bytes;
PWAVEFORMATEX pwfx;
IDirectSoundCaptureBufferImpl* capture_buffer;
DWORD state;
UINT timerID;
CRITICAL_SECTION lock;
IMMDevice *mmdevice;
IAudioClient *client;
IAudioCaptureClient *capture;
struct list entry;
};
/*****************************************************************************
* IDirectSoundCaptureBuffer implementation structure
*/
struct IDirectSoundCaptureBufferImpl
{
IDirectSoundCaptureBuffer8 IDirectSoundCaptureBuffer8_iface;
IDirectSoundNotify IDirectSoundNotify_iface;
LONG numIfaces; /* "in use interfaces" refcount */
LONG ref, refn;
/* IDirectSoundCaptureBuffer fields */
DirectSoundCaptureDevice* device;
LPDSCBUFFERDESC pdscbd;
DWORD flags;
/* IDirectSoundNotify fields */
LPDSBPOSITIONNOTIFY notifies;
int nrofnotifies;
};
HRESULT IKsPrivatePropertySetImpl_Create(REFIID riid, void **ppv) DECLSPEC_HIDDEN;
/*******************************************************************************
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment