Emmanuel Maillard : winecoreaudio: Implement MIDIOut_Data.
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Apr 25 07:06:39 CDT 2007
Module: wine
Branch: master
Commit: 8f03804b8bbf072debe8449b00bf18272637e0be
URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f03804b8bbf072debe8449b00bf18272637e0be
Author: Emmanuel Maillard <mahanuu at free.fr>
Date: Wed Apr 25 01:06:32 2007 +0200
winecoreaudio: Implement MIDIOut_Data.
---
dlls/winecoreaudio.drv/coremidi.h | 3 +++
dlls/winecoreaudio.drv/midi.c | 33 +++++++++++++++++++++++++++++++--
2 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/dlls/winecoreaudio.drv/coremidi.h b/dlls/winecoreaudio.drv/coremidi.h
index 38f1507..2a02003 100644
--- a/dlls/winecoreaudio.drv/coremidi.h
+++ b/dlls/winecoreaudio.drv/coremidi.h
@@ -52,6 +52,9 @@ extern OSStatus MIDIObjectGetProperties(MIDIObjectRef obj, CFPropertyListRef *ou
typedef void *AudioUnit;
typedef void *AUGraph;
+extern OSStatus MusicDeviceMIDIEvent(AudioUnit au, UInt32 inStatus, UInt32 inData1, UInt32 inData2, UInt32 inOffsetSampleFrame);
+extern OSStatus MusicDeviceSysEx(AudioUnit au, const UInt8 *inData, UInt32 inLength);
+
#endif
/* coremidi.c */
diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c
index ce959d1..250f523 100644
--- a/dlls/winecoreaudio.drv/midi.c
+++ b/dlls/winecoreaudio.drv/midi.c
@@ -265,6 +265,36 @@ static DWORD MIDIOut_Close(WORD wDevID)
return ret;
}
+static DWORD MIDIOut_Data(WORD wDevID, DWORD dwParam)
+{
+ WORD evt = LOBYTE(LOWORD(dwParam));
+ WORD d1 = HIBYTE(LOWORD(dwParam));
+ WORD d2 = LOBYTE(HIWORD(dwParam));
+ UInt8 chn = (evt & 0x0F);
+ OSStatus err = noErr;
+
+ TRACE("wDevID=%d dwParam=%08X\n", wDevID, dwParam);
+
+ if (wDevID >= MIDIOut_NumDevs) {
+ WARN("bad device ID : %d\n", wDevID);
+ return MMSYSERR_BADDEVICEID;
+ }
+
+ TRACE("evt=%08x d1=%04x d2=%04x (evt & 0xF0)=%04x chn=%d\n", evt, d1, d2, (evt & 0xF0), chn);
+
+ if (destinations[wDevID].caps.wTechnology == MOD_SYNTH)
+ {
+ err = MusicDeviceMIDIEvent(destinations[wDevID].synth, (evt & 0xF0) | chn, d1, d2, 0);
+ if (err != noErr)
+ {
+ ERR("MusicDeviceMIDIEvent(%p, %04x, %04x, %04x, %d) return %c%c%c%c\n", destinations[wDevID].synth, (evt & 0xF0) | chn, d1, d2, 0, (char) (err >> 24), (char) (err >> 16), (char) (err >> 8), (char) err);
+ return MMSYSERR_ERROR;
+ }
+ }
+ else FIXME("MOD_MIDIPORT\n");
+
+ return MMSYSERR_NOERROR;
+}
/**************************************************************************
* MIDIOut_Prepare [internal]
@@ -358,6 +388,7 @@ DWORD WINAPI CoreAudio_modMessage(UINT wDevID, UINT wMsg, DWORD dwUser, DWORD dw
case MODM_CLOSE:
return MIDIOut_Close(wDevID);
case MODM_DATA:
+ return MIDIOut_Data(wDevID, dwParam1);
case MODM_LONGDATA:
TRACE("Unsupported message (08%x)\n", wMsg);
return MMSYSERR_NOTSUPPORTED;
@@ -378,8 +409,6 @@ DWORD WINAPI CoreAudio_modMessage(UINT wDevID, UINT wMsg, DWORD dwUser, DWORD dw
return MMSYSERR_NOTSUPPORTED;
}
-
-
#else
DWORD WINAPI CoreAudio_modMessage(UINT wDevID, UINT wMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2)
More information about the wine-cvs
mailing list