From cb5c00d57c449234becc520e2633f444de5af9b8 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Sat, 3 Jan 2004 00:58:08 +0000 Subject: [PATCH] Avoid referencing a private header in another dll. --- dlls/dmime/dmime_private.h | 13 +++++++++++-- dlls/dmusic/dmusic_private.h | 11 ----------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h index b68343f6c2b..dd6d06d82c0 100644 --- a/dlls/dmime/dmime_private.h +++ b/dlls/dmime/dmime_private.h @@ -34,8 +34,6 @@ #include "dmusicf.h" #include "dsound.h" -#include "../dmusic/dmusic_private.h" - /***************************************************************************** * Interfaces */ @@ -167,6 +165,17 @@ extern HRESULT WINAPI DMUSIC_CreateDirectMusicTempoTrack (LPCGUID lpcGUID, LPDIR extern HRESULT WINAPI DMUSIC_CreateDirectMusicTimeSigTrack (LPCGUID lpcGUID, LPDIRECTMUSICTRACK8* ppTrack, LPUNKNOWN pUnkOuter); extern HRESULT WINAPI DMUSIC_CreateDirectMusicWaveTrack (LPCGUID lpcGUID, LPDIRECTMUSICTRACK8* ppTrack, LPUNKNOWN pUnkOuter); +/* some sort of aux. performance channel: as far as i can understand, these are + used to represent a particular midi channel in particular group at particular + group; so all we need to do is to fill it with parent port, group and midi + channel ? */ +typedef struct DMUSIC_PRIVATE_PCHANNEL_ +{ + DWORD channel; /* map to this channel... */ + DWORD group; /* ... in this group ... */ + IDirectMusicPort *port; /* ... at this port */ +} DMUSIC_PRIVATE_PCHANNEL, *LPDMUSIC_PRIVATE_PCHANNEL; + /***************************************************************************** * IDirectMusicPerformance8Impl implementation structure */ diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index 0d796d0de27..63d11752b3a 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -72,17 +72,6 @@ extern ICOM_VTABLE(IPersistStream) DirectMusicCollectionObjectStream_Vtbl; * Some stuff to make my life easier :=) */ -/* some sort of aux. performance channel: as far as i can understand, these are - used to represent a particular midi channel in particular group at particular - group; so all we need to do is to fill it with parent port, group and midi - channel ? */ -typedef struct DMUSIC_PRIVATE_PCHANNEL_ -{ - DWORD channel; /* map to this channel... */ - DWORD group; /* ... in this group ... */ - IDirectMusicPort *port; /* ... at this port */ -} DMUSIC_PRIVATE_PCHANNEL, *LPDMUSIC_PRIVATE_PCHANNEL; - /* some sort of aux. midi channel: big fake at the moment; accepts only priority changes... more coming soon */ typedef struct DMUSIC_PRIVATE_MCHANNEL_