aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorTorbjörn Andersson2005-06-22 06:37:02 +0000
committerTorbjörn Andersson2005-06-22 06:37:02 +0000
commit8f4077d9926ec6f59419c33102703bed7ec043b5 (patch)
tree56c47223c104056ddc24b058a62d88fb4fdd636c /scumm
parentb9881d63f63164b57f71a25bc9f596b7b00b74e7 (diff)
downloadscummvm-rg350-8f4077d9926ec6f59419c33102703bed7ec043b5.tar.gz
scummvm-rg350-8f4077d9926ec6f59419c33102703bed7ec043b5.tar.bz2
scummvm-rg350-8f4077d9926ec6f59419c33102703bed7ec043b5.zip
Fixed warning. (And made some whitespace changes.)
svn-id: r18433
Diffstat (limited to 'scumm')
-rw-r--r--scumm/imuse.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/scumm/imuse.cpp b/scumm/imuse.cpp
index a27db42e00..fead93c9d6 100644
--- a/scumm/imuse.cpp
+++ b/scumm/imuse.cpp
@@ -1263,7 +1263,8 @@ void IMuseInternal::initMT32(MidiDriver *midi) {
void IMuseInternal::initGM(MidiDriver *midi) {
byte buffer[11];
- int i=0;
+ int i;
+
// General MIDI System On message
// Resets all GM devices to default settings
memcpy(&buffer[0], "\xF0\x7E\x7F\x09\x01\xF7", 6);
@@ -1290,7 +1291,6 @@ void IMuseInternal::initGM(MidiDriver *midi) {
g_system->delayMillis(200);
if (_sc55) {
-
// This mode is for GS devices that support an MT-32-compatible
// Map, such as the Roland Sound Canvas line of modules. It
// will allow them to work with True MT-32 mode, but will
@@ -1298,7 +1298,7 @@ void IMuseInternal::initGM(MidiDriver *midi) {
// instruments).
// Set Channels 1-16 to SC-55 Map, then CM-64/32L Variation
- for (int i = 0; i < 16; ++i) {
+ for (i = 0; i < 16; ++i) {
midi->send(( 127 << 16) | (0 << 8) | (0xB0 | i));
midi->send(( 1 << 16) | (32 << 8) | (0xB0 | i));
midi->send(( 0 << 16) | (0 << 8) | (0xC0 | i));
@@ -1400,9 +1400,7 @@ void IMuseInternal::initGM(MidiDriver *midi) {
memcpy(&buffer[5], "\x40\x01\x34\x6A\x21\xF7", 6);
midi->sysEx(buffer, 11);
debug(2, "GS SysEx: Reverb Time is 106");
-
}
-
}
void IMuseInternal::init_queue() {