[Scummvm-cvs-logs] scummvm master -> 1ec6ccc668b4f07b0ae019241dc9576ef44a42d5

[m-kiewitz]

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:
1ec6ccc668 SHERLOCK: RT: MT32: don't pass timbre file


Commit: 1ec6ccc668b4f07b0ae019241dc9576ef44a42d5
    https://github.com/scummvm/scummvm/commit/1ec6ccc668b4f07b0ae019241dc9576ef44a42d5
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2015-06-28T12:44:18+02:00

Commit Message:
SHERLOCK: RT: MT32: don't pass timbre file

because the game does not have one

Changed paths:
    engines/sherlock/music.cpp



diff --git a/engines/sherlock/music.cpp b/engines/sherlock/music.cpp
index f72eaf7..1c05006 100644
--- a/engines/sherlock/music.cpp
+++ b/engines/sherlock/music.cpp
@@ -273,11 +273,12 @@ Music::Music(SherlockEngine *vm, Audio::Mixer *mixer) : _vm(vm), _mixer(mixer) {
 			_midiDriver = Audio::MidiDriver_Miles_AdLib_create("SAMPLE.AD", "SAMPLE.OPL");
 			break;
 		case MT_MT32:
-			_midiDriver = Audio::MidiDriver_Miles_MT32_create("SAMPLE.MT");
+			// Sherlock Holmes 2 does not have a MT32 timbre file
+			_midiDriver = Audio::MidiDriver_Miles_MT32_create("");
 			break;
 		case MT_GM:
 			if (ConfMan.getBool("native_mt32")) {
-				_midiDriver = Audio::MidiDriver_Miles_MT32_create("SAMPLE.MT");
+				_midiDriver = Audio::MidiDriver_Miles_MT32_create("");
 				_musicType = MT_MT32;
 			}
 			break;