[Scummvm-cvs-logs] scummvm master -> 3c9bdaa04ff408f394bbdaf6cb6f2039ccfdecf7

[eriktorbjorn]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
3c9bdaa04f SHERLOCK: Use standard MIDI driver for General MIDI in Rose Tattoo


Commit: 3c9bdaa04ff408f394bbdaf6cb6f2039ccfdecf7
    https://github.com/scummvm/scummvm/commit/3c9bdaa04ff408f394bbdaf6cb6f2039ccfdecf7
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2015-06-28T22:47:21+02:00

Commit Message:
SHERLOCK: Use standard MIDI driver for General MIDI in Rose Tattoo

Unlike Serrated Scalpel, Rose Tattoo's music sounds good as General
MIDI, and our standard driver should work well enough for that.

Changed paths:
    engines/sherlock/music.cpp



diff --git a/engines/sherlock/music.cpp b/engines/sherlock/music.cpp
index 1c05006..c6e542d 100644
--- a/engines/sherlock/music.cpp
+++ b/engines/sherlock/music.cpp
@@ -280,6 +280,9 @@ Music::Music(SherlockEngine *vm, Audio::Mixer *mixer) : _vm(vm), _mixer(mixer) {
 			if (ConfMan.getBool("native_mt32")) {
 				_midiDriver = Audio::MidiDriver_Miles_MT32_create("");
 				_musicType = MT_MT32;
+			} else {
+				_midiDriver = MidiDriver::createMidi(dev);
+				_musicType = MT_GM;
 			}
 			break;
 		default: