[PATCH 3/4] dmusic: Move the SynthPortImpl struct to where it is used.
Michael Stefaniuc
mstefani at redhat.de
Wed Oct 5 03:28:54 CDT 2016
Signed-off-by: Michael Stefaniuc <mstefani at redhat.de>
---
dlls/dmusic/dmusic_private.h | 24 ------------------------
dlls/dmusic/port.c | 16 ++++++++++++++++
2 files changed, 16 insertions(+), 24 deletions(-)
diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h
index 44d5d57..07f5f1d 100644
--- a/dlls/dmusic/dmusic_private.h
+++ b/dlls/dmusic/dmusic_private.h
@@ -53,8 +53,6 @@ typedef struct IReferenceClockImpl IReferenceClockImpl;
typedef struct IDirectMusicInstrumentImpl IDirectMusicInstrumentImpl;
-typedef struct SynthPortImpl SynthPortImpl;
-
/*****************************************************************************
* Some stuff to make my life easier :=)
*/
@@ -159,28 +157,6 @@ struct IDirectMusicDownloadImpl {
/* IDirectMusicDownloadImpl fields */
};
-/*****************************************************************************
- * SynthPortImpl implementation structure
- */
-struct SynthPortImpl {
- /* IUnknown fields */
- IDirectMusicPort IDirectMusicPort_iface;
- IDirectMusicPortDownload IDirectMusicPortDownload_iface;
- IDirectMusicThru IDirectMusicThru_iface;
- LONG ref;
-
- /* IDirectMusicPort fields */
- IDirectSound* pDirectSound;
- IReferenceClock* pLatencyClock;
- IDirectMusicSynth* synth;
- IDirectMusicSynthSink* synth_sink;
- BOOL fActive;
- DMUS_PORTCAPS caps;
- DMUS_PORTPARAMS params;
- int nrofgroups;
- DMUSIC_PRIVATE_CHANNEL_GROUP group[1];
-};
-
/** Internal factory */
extern HRESULT DMUSIC_CreateSynthPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkouter, LPDMUS_PORTPARAMS port_params, LPDMUS_PORTCAPS port_caps, DWORD device) DECLSPEC_HIDDEN;
extern HRESULT DMUSIC_CreateMidiOutPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkouter, LPDMUS_PORTPARAMS port_params, LPDMUS_PORTCAPS port_caps, DWORD device) DECLSPEC_HIDDEN;
diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c
index 95db9e0..b694ef7 100644
--- a/dlls/dmusic/port.c
+++ b/dlls/dmusic/port.c
@@ -24,6 +24,22 @@
WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
+typedef struct SynthPortImpl {
+ IDirectMusicPort IDirectMusicPort_iface;
+ IDirectMusicPortDownload IDirectMusicPortDownload_iface;
+ IDirectMusicThru IDirectMusicThru_iface;
+ LONG ref;
+ IDirectSound *pDirectSound;
+ IReferenceClock *pLatencyClock;
+ IDirectMusicSynth *synth;
+ IDirectMusicSynthSink *synth_sink;
+ BOOL fActive;
+ DMUS_PORTCAPS caps;
+ DMUS_PORTPARAMS params;
+ int nrofgroups;
+ DMUSIC_PRIVATE_CHANNEL_GROUP group[1];
+} SynthPortImpl;
+
static inline IDirectMusicDownloadedInstrumentImpl* impl_from_IDirectMusicDownloadedInstrument(IDirectMusicDownloadedInstrument *iface)
{
return CONTAINING_RECORD(iface, IDirectMusicDownloadedInstrumentImpl, IDirectMusicDownloadedInstrument_iface);
--
2.5.5
More information about the wine-patches
mailing list