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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ebf33fff47b773420cd1f8006fc8118f4e1a9d2d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ebf33fff47b773420cd1f8006f...

Author: Michael Stefaniuc <mstefani(a)redhat.de>
Date:   Thu Aug 30 23:48:27 2012 +0200

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

---

 dlls/dsound/capture.c        |   37 +++++++++++++++++++++++++++++++++
 dlls/dsound/dsound_private.h |   47 ------------------------------------------
 2 files changed, 37 insertions(+), 47 deletions(-)

diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c
index 8d0fc65..309702a 100644
--- a/dlls/dsound/capture.c
+++ b/dlls/dsound/capture.c
@@ -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)
 {
diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
index 0d2cf75..eb582da 100644
--- a/dlls/dsound/dsound_private.h
+++ b/dlls/dsound/dsound_private.h
@@ -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;
 
 /*******************************************************************************