libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-12 12:09:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GROOVIE: add support for Miles Audio MIDI driver

Browse Source 
- currently optional, to enable set milesAudioEnabled to true
This commit is contained in:
Martin Kiewitz 2015-06-28 01:16:43 +02:00
parent 0655839a4f
commit 7ecf553e24
2 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
engines/groovie/music.cpp
View File

@ -36,6 +36,7 @@
#include "common/textconsole.h"
#include "audio/audiostream.h"
#include "audio/midiparser.h"
#include "audio/miles.h"
namespace Groovie {
@ -384,7 +385,42 @@ MusicPlayerXMI::MusicPlayerXMI(GroovieEngine *vm, const Common::String &gtlName)
// Create the driver
MidiDriver::DeviceHandle dev = MidiDriver::detectDevice(MDT_MIDI | MDT_ADLIB | MDT_PREFER_GM);
_driver = MidiDriver::createMidi(dev);
MusicType musicType = MidiDriver::getMusicType(dev);
_driver = NULL;
// new Miles Audio support, to enable set milesAudioEnabled to true
// Attention: MT32 timbre file currently not supported, work in progress
_milesAudioMode = false;
bool milesAudioEnabled = false;
if (milesAudioEnabled) {
// 7th Guest uses FAT.AD/FAT.OPL/FAT.MT
// 11th Hour uses SAMPLE.AD/SAMPLE.OPL/SAMPLE.MT
switch (musicType) {
case MT_ADLIB:
_driver = Audio::MidiDriver_Miles_AdLib_create(gtlName + ".AD", gtlName + ".OPL");
break;
case MT_MT32:
_driver = Audio::MidiDriver_Miles_MT32_create(gtlName + ".MT");
break;
case MT_GM:
if (ConfMan.getBool("native_mt32")) {
_driver = Audio::MidiDriver_Miles_MT32_create(gtlName + "FAT.MT");
musicType = MT_MT32;
}
break;
}
}
if (_driver) {
_milesAudioMode = true;
}
if (!_driver) {
// No driver yet? create a generic one
_driver = MidiDriver::createMidi(dev);
}
assert(_driver);
_driver->open(); // TODO: Handle return value != 0 (indicating an error)
@ -400,6 +436,9 @@ MusicPlayerXMI::MusicPlayerXMI(GroovieEngine *vm, const Common::String &gtlName)
_chanBanks[i] = 0;
}
if (_milesAudioMode)
return;
// Load the Global Timbre Library
if (MidiDriver::getMusicType(dev) == MT_ADLIB) {
// MIDI through AdLib
@ -433,6 +472,11 @@ MusicPlayerXMI::~MusicPlayerXMI() {
}
void MusicPlayerXMI::send(uint32 b) {
if (_milesAudioMode) {
MusicPlayerMidi::send(b);
return;
}
if ((b & 0xFFF0) == 0x72B0) { // XMIDI Patch Bank Select 114
// From AIL2's documentation: XMIDI Patch Bank Select controller (114)
// selects a bank to be used when searching the next patches

2
engines/groovie/music.h
View File

@ -134,6 +134,8 @@ private:
// Output music type
uint8 _musicType;
bool _milesAudioMode;
// Timbres
class Timbre {
public: