[PATCH 4/4] dmime: Move struct IDirectMusicPerformance8Impl to the c file.
Michael Stefaniuc
mstefani at redhat.de
Sun Apr 1 17:08:57 CDT 2012
---
Of course this is optional and should be skipped if Andrew has further
patches that require a global IDirectMusicPerformance8Impl.
dlls/dmime/dmime_private.h | 42 ------------------------------------------
dlls/dmime/performance.c | 32 ++++++++++++++++++++++++++++++++
2 files changed, 32 insertions(+), 42 deletions(-)
diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h
index 95c3324..de6533d 100644
--- a/dlls/dmime/dmime_private.h
+++ b/dlls/dmime/dmime_private.h
@@ -46,7 +46,6 @@
/*****************************************************************************
* Interfaces
*/
-typedef struct IDirectMusicPerformance8Impl IDirectMusicPerformance8Impl;
typedef struct IDirectMusicSegment8Impl IDirectMusicSegment8Impl;
typedef struct IDirectMusicSegmentState8Impl IDirectMusicSegmentState8Impl;
typedef struct IDirectMusicGraphImpl IDirectMusicGraphImpl;
@@ -124,47 +123,6 @@ typedef struct DMUSIC_PRIVATE_PCHANNEL_ {
} DMUSIC_PRIVATE_PCHANNEL, *LPDMUSIC_PRIVATE_PCHANNEL;
/*****************************************************************************
- * IDirectMusicPerformance8Impl implementation structure
- */
-struct IDirectMusicPerformance8Impl {
- /* IUnknown fields */
- IDirectMusicPerformance8 IDirectMusicPerformance8_iface;
- LONG ref;
-
- /* IDirectMusicPerformanceImpl fields */
- IDirectMusic8* pDirectMusic;
- IDirectSound* pDirectSound;
- IDirectMusicGraph* pToolGraph;
- DMUS_AUDIOPARAMS pParams;
-
- /* global parameters */
- BOOL fAutoDownload;
- char cMasterGrooveLevel;
- float fMasterTempo;
- long lMasterVolume;
-
- /* performance channels */
- DMUSIC_PRIVATE_PCHANNEL PChannel[32];
-
- /* IDirectMusicPerformance8Impl fields */
- IDirectMusicAudioPath* pDefaultPath;
- HANDLE hNotification;
- REFERENCE_TIME rtMinimum;
-
- REFERENCE_TIME rtLatencyTime;
- DWORD dwBumperLength;
- DWORD dwPrepareTime;
- /** Message Processing */
- HANDLE procThread;
- DWORD procThreadId;
- REFERENCE_TIME procThreadStartTime;
- BOOL procThreadTicStarted;
- CRITICAL_SECTION safe;
- struct DMUS_PMSGItem* head;
- struct DMUS_PMSGItem* imm_head;
-};
-
-/*****************************************************************************
* IDirectMusicSegment8Impl implementation structure
*/
struct IDirectMusicSegment8Impl {
diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c
index dac4a42..bc44fa5 100644
--- a/dlls/dmime/performance.c
+++ b/dlls/dmime/performance.c
@@ -22,6 +22,38 @@
WINE_DEFAULT_DEBUG_CHANNEL(dmime);
+typedef struct IDirectMusicPerformance8Impl {
+ IDirectMusicPerformance8 IDirectMusicPerformance8_iface;
+ LONG ref;
+ /* IDirectMusicPerformanceImpl fields */
+ IDirectMusic8 *pDirectMusic;
+ IDirectSound *pDirectSound;
+ IDirectMusicGraph *pToolGraph;
+ DMUS_AUDIOPARAMS pParams;
+ /* global parameters */
+ BOOL fAutoDownload;
+ char cMasterGrooveLevel;
+ float fMasterTempo;
+ long lMasterVolume;
+ /* performance channels */
+ DMUSIC_PRIVATE_PCHANNEL PChannel[32];
+ /* IDirectMusicPerformance8Impl fields */
+ IDirectMusicAudioPath *pDefaultPath;
+ HANDLE hNotification;
+ REFERENCE_TIME rtMinimum;
+ REFERENCE_TIME rtLatencyTime;
+ DWORD dwBumperLength;
+ DWORD dwPrepareTime;
+ /** Message Processing */
+ HANDLE procThread;
+ DWORD procThreadId;
+ REFERENCE_TIME procThreadStartTime;
+ BOOL procThreadTicStarted;
+ CRITICAL_SECTION safe;
+ struct DMUS_PMSGItem *head;
+ struct DMUS_PMSGItem *imm_head;
+} IDirectMusicPerformance8Impl;
+
typedef struct DMUS_PMSGItem DMUS_PMSGItem;
struct DMUS_PMSGItem {
DMUS_PMSGItem* next;
--
1.7.6.5
More information about the wine-patches
mailing list