Michael Stefaniuc : dmime: Get rid of the DMUSIC_PRIVATE_PCHANNEL typedef.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 02d6dae4f17f501c3e7331eb70a0c0c488ebdecf
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=02d6dae4f17f501c3e7331eb7...

Author: Michael Stefaniuc <mstefani(a)winehq.org>
Date:   Sun Jan 26 21:51:38 2020 +0100

dmime: Get rid of the DMUSIC_PRIVATE_PCHANNEL typedef.

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/dmime/dmime_private.h | 10 ----------
 dlls/dmime/performance.c   |  6 +++++-
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h
index 983db7f62b..576ebc1ae8 100644
--- a/dlls/dmime/dmime_private.h
+++ b/dlls/dmime/dmime_private.h
@@ -102,16 +102,6 @@ typedef struct _DMUS_PRIVATE_TEMPO_PLAY_STATE {
   DWORD dummy;
 } DMUS_PRIVATE_TEMPO_PLAY_STATE, *LPDMUS_PRIVATE_TEMPO_PLAY_STATE;
 
-/* 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;
-
 /**********************************************************************
  * Dll lifetime tracking declaration for dmime.dll
  */
diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c
index 3dd54a6cb6..c492ebdcb1 100644
--- a/dlls/dmime/performance.c
+++ b/dlls/dmime/performance.c
@@ -27,7 +27,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime);
 
 struct pchannel_block {
     DWORD block_num;   /* Block 0 is PChannels 0-15, Block 1 is PChannels 16-31, etc */
-    DMUSIC_PRIVATE_PCHANNEL pchannel[16];
+    struct {
+       DWORD channel;  /* MIDI channel */
+       DWORD group;    /* MIDI group */
+       IDirectMusicPort *port;
+    } pchannel[16];
     struct wine_rb_entry entry;
 };