[prev in list] [next in list] [prev in thread] [next in thread] 

List:       wine-devel
Subject:    MIDI Mapper fix
From:       "Jeff Smith" <whydoubt () hotmail ! com>
Date:       2002-11-30 14:37:46
[Download RAW message or body]

I'm so happy, I just had to share it with everyone :-D

Changelog:
Fix for MIDI Mapper.

Notes:
Finally found it!  This was the last thing keeping sound from working
in Auralia.  With just this simple patch, it now works.  Auralia still
has a few problems, but they are minor in comparison.  It *is* kind of
important for sound to work in an ear training program ;-)

BTW, Thanks to Eric P. for his help getting me off to a running start
with his fixes to the OSS MIDI driver a couple of weeks back.

(patch is attached - Hotmail has not been kind to my inlined patches the
past few days)

_________________________________________________________________
Help STOP SPAM with the new MSN 8 and get 2 months FREE*  
http://join.msn.com/?page=features/junkmail

["midimap.diff" (text/x-diff)]

Index: dlls/winmm/midimap/midimap.c
===================================================================
RCS file: /home/wine/wine/dlls/winmm/midimap/midimap.c,v
retrieving revision 1.14
diff -u -r1.14 midimap.c
--- dlls/winmm/midimap/midimap.c	1 Aug 2002 18:17:51 -0000	1.14
+++ dlls/winmm/midimap/midimap.c	30 Nov 2002 14:13:36 -0000
@@ -243,7 +243,7 @@
 
 	for (i = 0; i < 16; i++)
 	{
-	    TRACE("chnMap[% 2d] => %d\n",
+	    TRACE("chnMap[%2d] => %d\n",
 		  i, mom->ChannelMap[i] ? mom->ChannelMap[i]->uDevID : -1);
 	}
     }
@@ -254,7 +254,7 @@
 {
     MIDIMAPDATA*	mom = HeapAlloc(GetProcessHeap(), 0, sizeof(MIDIMAPDATA));
 
-    TRACE("(%p %p %08lx\n", lpdwUser, lpDesc, dwFlags);
+    TRACE("(%p %p %08lx)\n", lpdwUser, lpDesc, dwFlags);
 
     if (!mom) return MMSYSERR_NOMEM;
 
@@ -499,7 +499,7 @@
 	    strcpy(midiOutPorts[dev].name, moc.szPname);
 	    midiOutPorts[dev].loaded = 0;
 	    midiOutPorts[dev].hMidi = 0;
-	    midiOutPorts[dev].uDevID = 0;
+	    midiOutPorts[dev].uDevID = dev;
 	    midiOutPorts[dev].lpbPatch = NULL;
 	    for (i = 0; i < 16; i++)
 		midiOutPorts[dev].aChn[i] = i;



[prev in list] [next in list] [prev in thread] [next in thread]