diff options
| author | Johannes Schickel | 2010-12-01 23:55:10 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-12-01 23:55:10 +0000 |
| commit | b36b7ee3493dbf086ffb6aba4a3cb5b5daa4d7d7 (patch) | |
| tree | fcafdd5caa9a6bf5571a410d17a7b225c24880af /engines | |
| parent | 349ebe94f19c5d7d2108a0c97aaeb2f5b5709b6e (diff) | |
| download | scummvm-rg350-b36b7ee3493dbf086ffb6aba4a3cb5b5daa4d7d7.tar.gz scummvm-rg350-b36b7ee3493dbf086ffb6aba4a3cb5b5daa4d7d7.tar.bz2 scummvm-rg350-b36b7ee3493dbf086ffb6aba4a3cb5b5daa4d7d7.zip | |
SCUMM: Fix GM initialization when "enable_gs" is set.
This is a regression from r25630, which caused the code to send some garbage
data to the GS device, which resulted in some devices to fail with an
"Address Error." (like the Roland SC-55).
This might also fix bug #1927501 "GS option is broken". Even though actually
the device there failed with another error it is likely to be caused by the
same code. At least it is the only iMuse MIDI code change between 0.9.0 and
0.12.0, which might result in such a problem.
svn-id: r54727
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/scumm/imuse/imuse.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/engines/scumm/imuse/imuse.cpp b/engines/scumm/imuse/imuse.cpp index 8cccbc227a..4db40e6247 100644 --- a/engines/scumm/imuse/imuse.cpp +++ b/engines/scumm/imuse/imuse.cpp @@ -1483,12 +1483,11 @@ void IMuseInternal::initGM(MidiDriver *midi) { // General MIDI System On message // Resets all GM devices to default settings memcpy(&buffer[0], "\x7E\x7F\x09\x01", 4); - midi->sysEx(buffer, 6); + midi->sysEx(buffer, 4); debug(2, "GM SysEx: GM System On"); _system->delayMillis(200); if (_enable_gs) { - // All GS devices recognize the GS Reset command, // even with Roland's ID. It is impractical to // support other manufacturers' devices for |