Initial MIDI support on Mac OS X (7/8)
Emmanuel Maillard
mahanuu at free.fr
Tue Apr 24 18:30:45 CDT 2007
Changelog :
- implement MIDIOut_GetVolume and MIDIOut_SetVolume
-------------- next part --------------
From 97891cee2a4c68d6f0056aa1570d520e70136a50 Mon Sep 17 00:00:00 2001
From: Emmanuel Maillard <mahanuu at free.fr>
Date: Wed, 25 Apr 2007 01:16:44 +0200
Subject: [PATCH] - implement MIDIOut_GetVolume and MIDIOut_SetVolume
---
dlls/winecoreaudio.drv/coremidi.h | 3 ++
dlls/winecoreaudio.drv/midi.c | 54 ++++++++++++++++++++++++++++++++++++-
2 files changed, 56 insertions(+), 1 deletions(-)
diff --git a/dlls/winecoreaudio.drv/coremidi.h b/dlls/winecoreaudio.drv/coremidi.h
index 83649d6..ee4bdff 100644
--- a/dlls/winecoreaudio.drv/coremidi.h
+++ b/dlls/winecoreaudio.drv/coremidi.h
@@ -55,6 +55,9 @@ 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);
+/* audiounit.c */
+extern int AudioUnit_SetVolume(AudioUnit au, float left, float right);
+extern int AudioUnit_GetVolume(AudioUnit au, float *left, float *right);
#endif
/* coremidi.c */
diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c
index 91384e4..399ee5f 100644
--- a/dlls/winecoreaudio.drv/midi.c
+++ b/dlls/winecoreaudio.drv/midi.c
@@ -449,6 +449,56 @@ static DWORD MIDIOut_GetNumDevs(void)
return MIDIOut_NumDevs;
}
+static DWORD MIDIOut_GetVolume(WORD wDevID, DWORD *lpdwVolume)
+{
+ TRACE("%d\n", wDevID);
+
+ if (wDevID >= MIDIOut_NumDevs) {
+ WARN("bad device ID : %d\n", wDevID);
+ return MMSYSERR_BADDEVICEID;
+ }
+ if (lpdwVolume == NULL) {
+ WARN("Invalid Parameter\n");
+ return MMSYSERR_INVALPARAM;
+ }
+
+ if (destinations[wDevID].caps.wTechnology == MOD_SYNTH)
+ {
+ float left;
+ float right;
+ AudioUnit_GetVolume(destinations[wDevID].synth, &left, &right);
+
+ *lpdwVolume = ((WORD) left * 0xFFFFl) + (((WORD) right * 0xFFFFl) << 16);
+
+ return MMSYSERR_NOERROR;
+ }
+
+ return MMSYSERR_NOTSUPPORTED;
+}
+
+static DWORD MIDIOut_SetVolume(WORD wDevID, DWORD dwVolume)
+{
+ TRACE("%d\n", wDevID);
+
+ if (wDevID >= MIDIOut_NumDevs) {
+ WARN("bad device ID : %d\n", wDevID);
+ return MMSYSERR_BADDEVICEID;
+ }
+ if (destinations[wDevID].caps.wTechnology == MOD_SYNTH)
+ {
+ float left;
+ float right;
+
+ left = LOWORD(dwVolume) / 65535.0f;
+ right = HIWORD(dwVolume) / 65535.0f;
+ AudioUnit_SetVolume(destinations[wDevID].synth, left, right);
+
+ return MMSYSERR_NOERROR;
+ }
+
+ return MMSYSERR_NOTSUPPORTED;
+}
+
/**************************************************************************
* modMessage
*/
@@ -471,7 +521,7 @@ DWORD WINAPI CoreAudio_modMessage(UINT w
case MODM_LONGDATA:
return MIDIOut_LongData(wDevID, (LPMIDIHDR)dwParam1, dwParam2);
case MODM_PREPARE:
- return MIDIOut_Prepare(wDevID, (LPMIDIHDR)dwParam1, dwParam2);
+ return MIDIOut_Prepare(wDevID, (LPMIDIHDR)dwParam1, dwParam2);
case MODM_UNPREPARE:
return MIDIOut_Unprepare(wDevID, (LPMIDIHDR)dwParam1, dwParam2);
case MODM_GETDEVCAPS:
@@ -479,7 +529,9 @@ DWORD WINAPI CoreAudio_modMessage(UINT w
case MODM_GETNUMDEVS:
return MIDIOut_GetNumDevs();
case MODM_GETVOLUME:
+ return MIDIOut_GetVolume(wDevID, (DWORD*)dwParam1);
case MODM_SETVOLUME:
+ return MIDIOut_SetVolume(wDevID, dwParam1);
case MODM_RESET:
default:
TRACE("Unsupported message (08%x)\n", wMsg);
--
1.4.4
More information about the wine-patches
mailing list