[Scummvm-cvs-logs] CVS: scummvm/backends/midi coremidi.cpp,NONE,1.1 coreaudio.cpp,1.19,1.20
Max Horn
fingolfin at users.sourceforge.net
Mon Dec 26 03:19:05 CET 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sound mididrv.cpp,1.68,1.69 mididrv.h,1.50,1.51
- Next message: [Scummvm-cvs-logs] CVS: scummvm/kyra kyra.cpp,1.96,1.97 kyra.h,1.54,1.55 staticres.cpp,1.28,1.29
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/backends/midi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7821/backends/midi
Modified Files:
coreaudio.cpp
Added Files:
coremidi.cpp
Log Message:
New CoreMIDI midi backend for OS X
--- NEW FILE: coremidi.cpp ---
/* ScummVM - Scumm Interpreter
* Copyright (C) 2001-2005 The ScummVM project
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* $Header: /cvsroot/scummvm/scummvm/backends/midi/coremidi.cpp,v 1.1 2005/12/26 11:18:25 fingolfin Exp $
*/
#ifdef MACOSX
#include "common/stdafx.h"
#include "common/config-manager.h"
#include "common/util.h"
#include "sound/mpu401.h"
#include <CoreMIDI/CoreMIDI.h>
/*
For information on how to unify the CoreMidi and MusicDevice code:
http://lists.apple.com/archives/Coreaudio-api/2005/Jun/msg00194.html
http://lists.apple.com/archives/coreaudio-api/2003/Mar/msg00248.html
http://lists.apple.com/archives/coreaudio-api/2003/Jul/msg00137.html
*/
/* CoreMIDI MIDI driver
* By Max Horn
*/
class MidiDriver_CoreMIDI : public MidiDriver_MPU401 {
public:
MidiDriver_CoreMIDI();
~MidiDriver_CoreMIDI();
int open();
void close();
void send(uint32 b);
void sysEx(byte *msg, uint16 length);
private:
MIDIClientRef mClient;
MIDIPortRef mOutPort;
MIDIEndpointRef mDest;
};
MidiDriver_CoreMIDI::MidiDriver_CoreMIDI()
: mClient(0), mOutPort(0), mDest(0) {
OSStatus err;
err = MIDIClientCreate(CFSTR("ScummVM MIDI Driver for OS X"), NULL, NULL, &mClient);
}
MidiDriver_CoreMIDI::~MidiDriver_CoreMIDI() {
if (mClient)
MIDIClientDispose(mClient);
mClient = 0;
}
int MidiDriver_CoreMIDI::open() {
if (mDest)
return MERR_ALREADY_OPEN;
OSStatus err = noErr;
mOutPort = 0;
int dests = MIDIGetNumberOfDestinations();
if (dests > 0 && mClient) {
mDest = MIDIGetDestination(0);
err = MIDIOutputPortCreate( mClient,
CFSTR("scummvm_output_port"),
&mOutPort);
} else {
return MERR_DEVICE_NOT_AVAILABLE;
}
if (err != noErr)
return MERR_CANNOT_CONNECT;
return 0;
}
void MidiDriver_CoreMIDI::close() {
MidiDriver_MPU401::close();
if (mOutPort && mDest) {
MIDIPortDispose(mOutPort);
mOutPort = 0;
mDest = 0;
}
}
void MidiDriver_CoreMIDI::send(uint32 b) {
assert(mOutPort != NULL);
assert(mDest != NULL);
byte status_byte = (b & 0x000000FF);
byte first_byte = (b & 0x0000FF00) >> 8;
byte second_byte = (b & 0x00FF0000) >> 16;
MIDIPacketList packetList;
MIDIPacket *packet = &packetList.packet[0];
packetList.numPackets = 1;
packet->timeStamp = 0;
packet->length = 3;
packet->data[0] = status_byte;
packet->data[1] = first_byte;
packet->data[2] = second_byte;
MIDISend(mOutPort, mDest, &packetList);
}
void MidiDriver_CoreMIDI::sysEx(byte *msg, uint16 length) {
assert(mOutPort != NULL);
assert(mDest != NULL);
byte buf[384];
MIDIPacketList *packetList = (MIDIPacketList *)buf;
MIDIPacket *packet = packetList->packet;
assert(sizeof(buf) >= sizeof(UInt32) + sizeof(MIDITimeStamp) + sizeof(UInt16) + length + 2);
packetList->numPackets = 1;
packet->timeStamp = 0;
// Add SysEx frame if missing
if (*msg != 0xF0) {
packet->length = length + 2;
packet->data[0] = 0xF0;
memcpy(packet->data + 1, msg, length);
packet->data[length + 1] = 0xF7;
} else {
packet->length = length;
memcpy(packet->data, msg, length);
}
MIDISend(mOutPort, mDest, packetList);
}
MidiDriver *MidiDriver_CoreMIDI_create() {
return new MidiDriver_CoreMIDI();
}
#endif // MACOSX
Index: coreaudio.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/midi/coreaudio.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- coreaudio.cpp 18 Oct 2005 01:30:13 -0000 1.19
+++ coreaudio.cpp 26 Dec 2005 11:18:25 -0000 1.20
@@ -26,7 +26,7 @@
#include "sound/mpu401.h"
#include <AudioUnit/AudioUnit.h>
-#include <CoreMIDI/CoreMIDI.h>7
+
// Activating the following switch disables reverb support in the CoreAudio
@@ -35,13 +35,12 @@
// TODO: Maybe make this a config option?
//#define COREAUDIO_DISABLE_REVERB
+/*
+See here to see how to react to a change of the default output unit:
+http://cvs.opendarwin.org/cgi-bin/cvsweb.cgi/proj/KDE-Darwin/arts/flow/audioiocoreaudio.cc?rev=HEAD&content-type=text/x-cvsweb-markup
+
+*/
-// Enable the following switch to make ScummVM try to use native MIDI hardware
-// on your computer for MIDI output. This is currently quite hackish, in
-// particular you have no way to specify which device is used (it just always
-// uses the first output device it can find), nor is there a switch to
-// force it to use the soft synth instead of the MIDI HW.
-//#define ENABLE_HACKISH_NATIVE_MIDI_SUPPORT 1
/* CoreAudio MIDI driver
* Based on code by Benjamin W. Zale
@@ -50,7 +49,6 @@
class MidiDriver_CORE : public MidiDriver_MPU401 {
public:
MidiDriver_CORE();
- ~MidiDriver_CORE();
int open();
void close();
void send(uint32 b);
@@ -59,117 +57,90 @@
private:
AudioUnit au_MusicDevice;
AudioUnit au_output;
-
- MIDIClientRef mClient;
- MIDIPortRef mOutPort;
- MIDIEndpointRef mDest;
};
MidiDriver_CORE::MidiDriver_CORE()
- : au_MusicDevice(0), au_output(0), mClient(0), mOutPort(0), mDest(0) {
-
- OSStatus err;
- err = MIDIClientCreate(CFSTR("ScummVM MIDI Driver for OS X"), NULL, NULL, &mClient);
-}
-
-MidiDriver_CORE::~MidiDriver_CORE() {
- if (mClient)
- MIDIClientDispose(mClient);
- mClient = 0;
+ : au_MusicDevice(0), au_output(0) {
}
int MidiDriver_CORE::open() {
- if (au_output || mDest)
+ if (au_output)
return MERR_ALREADY_OPEN;
- OSStatus err = noErr;
-
- mOutPort = 0;
-#ifdef ENABLE_HACKISH_NATIVE_MIDI_SUPPORT
- int dests = MIDIGetNumberOfDestinations();
- if (dests > 0 && mClient) {
- mDest = MIDIGetDestination(0);
- err = MIDIOutputPortCreate( mClient,
- CFSTR("scummvm_output_port"),
- &mOutPort);
- }
-#endif
-
- if (err != noErr || !mOutPort) {
- AudioUnitConnection auconnect;
- ComponentDescription compdesc;
- Component compid;
-
- // Open the Music Device.
- // We use the AudioUnit v1 API, even though it is deprecated, because
- // this way we stay compatible with older OS X versions.
- // For v2, we'd use kAudioUnitType_MusicDevice and kAudioUnitSubType_DLSSynth
- compdesc.componentType = kAudioUnitComponentType;
- compdesc.componentSubType = kAudioUnitSubType_MusicDevice;
- compdesc.componentManufacturer = kAudioUnitID_DLSSynth;
- compdesc.componentFlags = 0;
- compdesc.componentFlagsMask = 0;
- compid = FindNextComponent(NULL, &compdesc);
- au_MusicDevice = static_cast<AudioUnit>(OpenComponent(compid));
+ AudioUnitConnection auconnect;
+ ComponentDescription compdesc;
+ Component compid;
+ OSErr err;
- if (au_MusicDevice == 0)
- error("Failed opening CoreAudio music device");
+ // Open the Music Device.
+ // We use the AudioUnit v1 API, even though it is deprecated, because
+ // this way we stay compatible with older OS X versions.
+ // For v2, we'd use kAudioUnitType_MusicDevice and kAudioUnitSubType_DLSSynth
+ compdesc.componentType = kAudioUnitComponentType;
+ compdesc.componentSubType = kAudioUnitSubType_MusicDevice;
+ compdesc.componentManufacturer = kAudioUnitID_DLSSynth;
+ compdesc.componentFlags = 0;
+ compdesc.componentFlagsMask = 0;
+ compid = FindNextComponent(NULL, &compdesc);
+ au_MusicDevice = static_cast<AudioUnit>(OpenComponent(compid));
- // Load custom soundfont, if specified
- // FIXME: This is kind of a temporary hack. Better (IMO) would be to
- // query QuickTime for whatever custom soundfont was set in the
- // QuickTime Preferences, and use that automatically.
- if (ConfMan.hasKey("soundfont")) {
- FSRef fsref;
- FSSpec fsSpec;
- const char *soundfont = ConfMan.get("soundfont").c_str();
+ if (au_MusicDevice == 0)
+ error("Failed opening CoreAudio music device");
- err = FSPathMakeRef ((const byte *)soundfont, &fsref, NULL);
+ // Load custom soundfont, if specified
+ // FIXME: This is kind of a temporary hack. Better (IMO) would be to
+ // query QuickTime for whatever custom soundfont was set in the
+ // QuickTime Preferences, and use that automatically.
+ if (ConfMan.hasKey("soundfont")) {
+ FSRef fsref;
+ FSSpec fsSpec;
+ const char *soundfont = ConfMan.get("soundfont").c_str();
- if (err == noErr) {
- err = FSGetCatalogInfo (&fsref, kFSCatInfoNone, NULL, NULL, &fsSpec, NULL);
- }
+ err = FSPathMakeRef ((const byte *)soundfont, &fsref, NULL);
- if (err == noErr) {
- err = AudioUnitSetProperty (
- au_MusicDevice,
- kMusicDeviceProperty_SoundBankFSSpec, kAudioUnitScope_Global,
- 0,
- &fsSpec, sizeof(fsSpec)
- );
- }
+ if (err == noErr) {
+ err = FSGetCatalogInfo (&fsref, kFSCatInfoNone, NULL, NULL, &fsSpec, NULL);
+ }
- if (err != noErr)
- warning("Failed loading custom sound font '%s' (error %d)\n", soundfont, err);
+ if (err == noErr) {
+ err = AudioUnitSetProperty (
+ au_MusicDevice,
+ kMusicDeviceProperty_SoundBankFSSpec, kAudioUnitScope_Global,
+ 0,
+ &fsSpec, sizeof(fsSpec)
+ );
}
- // open the output unit
- au_output = (AudioUnit) OpenDefaultComponent(kAudioUnitComponentType, kAudioUnitSubType_Output);
- if (au_output == 0)
- error("Failed opening output audio unit");
+ if (err != noErr)
+ warning("Failed loading custom sound font '%s' (error %d)\n", soundfont, err);
+ }
- // connect the units
- auconnect.sourceAudioUnit = au_MusicDevice;
- auconnect.sourceOutputNumber = 0;
- auconnect.destInputNumber = 0;
- err =
- AudioUnitSetProperty(au_output, kAudioUnitProperty_MakeConnection, kAudioUnitScope_Input, 0,
- (void *)&auconnect, sizeof(AudioUnitConnection));
+ // open the output unit
+ au_output = (AudioUnit) OpenDefaultComponent(kAudioUnitComponentType, kAudioUnitSubType_Output);
+ if (au_output == 0)
+ error("Failed opening output audio unit");
- #ifdef COREAUDIO_DISABLE_REVERB
- UInt32 usesReverb = 0;
- AudioUnitSetProperty (au_MusicDevice, kMusicDeviceProperty_UsesInternalReverb,
- kAudioUnitScope_Global, 0, &usesReverb, sizeof (usesReverb));
- #endif
+ // connect the units
+ auconnect.sourceAudioUnit = au_MusicDevice;
+ auconnect.sourceOutputNumber = 0;
+ auconnect.destInputNumber = 0;
+ err =
+ AudioUnitSetProperty(au_output, kAudioUnitProperty_MakeConnection, kAudioUnitScope_Input, 0,
+ (void *)&auconnect, sizeof(AudioUnitConnection));
- // initialize the units
- AudioUnitInitialize(au_MusicDevice);
- AudioUnitInitialize(au_output);
+#ifdef COREAUDIO_DISABLE_REVERB
+ UInt32 usesReverb = 0;
+ AudioUnitSetProperty (au_MusicDevice, kMusicDeviceProperty_UsesInternalReverb,
+ kAudioUnitScope_Global, 0, &usesReverb, sizeof (usesReverb));
+#endif
- // start the output
- AudioOutputUnitStart(au_output);
+ // initialize the units
+ AudioUnitInitialize(au_MusicDevice);
+ AudioUnitInitialize(au_output);
+
+ // start the output
+ AudioOutputUnitStart(au_output);
- }
return 0;
}
@@ -177,91 +148,45 @@
void MidiDriver_CORE::close() {
MidiDriver_MPU401::close();
- if (mOutPort && mDest) {
- MIDIPortDispose(mOutPort);
- mOutPort = 0;
- mDest = 0;
- } else {
- // Stop the output
- AudioOutputUnitStop(au_output);
+ // Stop the output
+ AudioOutputUnitStop(au_output);
- // Cleanup
- CloseComponent(au_output);
- au_output = 0;
- CloseComponent(au_MusicDevice);
- au_MusicDevice = 0;
- }
+ // Cleanup
+ CloseComponent(au_output);
+ au_output = 0;
+ CloseComponent(au_MusicDevice);
+ au_MusicDevice = 0;
}
void MidiDriver_CORE::send(uint32 b) {
+ assert(au_output != NULL);
+ assert(au_MusicDevice != NULL);
+
byte status_byte = (b & 0x000000FF);
byte first_byte = (b & 0x0000FF00) >> 8;
byte second_byte = (b & 0x00FF0000) >> 16;
- if (mOutPort && mDest) {
- MIDIPacketList packetList;
- MIDIPacket *packet = &packetList.packet[0];
-
- packetList.numPackets = 1;
-
- packet->timeStamp = 0;
- packet->length = 3;
- packet->data[0] = status_byte;
- packet->data[1] = first_byte;
- packet->data[2] = second_byte;
-
- MIDISend(mOutPort, mDest, &packetList);
- } else {
- assert(au_output != NULL);
- assert(au_MusicDevice != NULL);
- MusicDeviceMIDIEvent(au_MusicDevice, status_byte, first_byte, second_byte, 0);
- }
+ MusicDeviceMIDIEvent(au_MusicDevice, status_byte, first_byte, second_byte, 0);
}
void MidiDriver_CORE::sysEx(byte *msg, uint16 length) {
+ assert(au_output != NULL);
+ assert(au_MusicDevice != NULL);
- if (mOutPort && mDest) {
- byte buf[384];
- MIDIPacketList *packetList = (MIDIPacketList *)buf;
- MIDIPacket *packet = packetList->packet;
-
- assert(sizeof(buf) >= sizeof(UInt32) + sizeof(MIDITimeStamp) + sizeof(UInt16) + length + 2);
-
- packetList->numPackets = 1;
-
- packet->timeStamp = 0;
-
- // Add SysEx frame if missing
- if (*msg != 0xF0) {
- packet->length = length + 2;
- packet->data[0] = 0xF0;
- memcpy(packet->data + 1, msg, length);
- packet->data[length + 1] = 0xF7;
- } else {
- packet->length = length;
- memcpy(packet->data, msg, length);
- }
-
- MIDISend(mOutPort, mDest, packetList);
- } else {
- assert(au_output != NULL);
- assert(au_MusicDevice != NULL);
-
- // Add SysEx frame if missing
- byte *buf = 0;
- if (*msg != 0xF0) {
- buf = (byte *)malloc(length + 2);
- buf[0] = 0xF0;
- memcpy(buf+1, msg, length);
- buf[length+1] = 0xF7;
- msg = buf;
- length += 2;
- }
+ // Add SysEx frame if missing
+ byte *buf = 0;
+ if (*msg != 0xF0) {
+ buf = (byte *)malloc(length + 2);
+ buf[0] = 0xF0;
+ memcpy(buf+1, msg, length);
+ buf[length+1] = 0xF7;
+ msg = buf;
+ length += 2;
+ }
- MusicDeviceSysEx(au_MusicDevice, msg, length);
+ MusicDeviceSysEx(au_MusicDevice, msg, length);
- free(buf);
- }
+ free(buf);
}
MidiDriver *MidiDriver_CORE_create() {
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sound mididrv.cpp,1.68,1.69 mididrv.h,1.50,1.51
- Next message: [Scummvm-cvs-logs] CVS: scummvm/kyra kyra.cpp,1.96,1.97 kyra.h,1.54,1.55 staticres.cpp,1.28,1.29
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list