[Scummvm-cvs-logs] CVS: scummvm/scumm imuse.cpp,2.134,2.135 imuse.h,1.59,1.60 imuse_player.cpp,2.50,2.51
Torbjörn Andersson
eriktorbjorn at users.sourceforge.net
Thu May 26 04:14:52 CEST 2005
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22407
Modified Files:
imuse.cpp imuse.h imuse_player.cpp
Log Message:
Cleanup. (Mostly whitespace.)
Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.cpp,v
retrieving revision 2.134
retrieving revision 2.135
diff -u -d -r2.134 -r2.135
--- imuse.cpp 26 May 2005 06:38:52 -0000 2.134
+++ imuse.cpp 26 May 2005 11:13:41 -0000 2.135
@@ -376,7 +376,7 @@
p = _cmd_queue[pos].array;
if (p[0] == TRIGGER_ID && p[1] == id && p[2] == data)
break;
- pos = (pos + 1) &(ARRAYSIZE(_cmd_queue) - 1);
+ pos = (pos + 1) & (ARRAYSIZE(_cmd_queue) - 1);
}
if (pos == _queue_pos)
@@ -388,7 +388,7 @@
_trigger_count--;
_queue_cleared = false;
do {
- pos = (pos + 1) &(ARRAYSIZE(_cmd_queue) - 1);
+ pos = (pos + 1) & (ARRAYSIZE(_cmd_queue) - 1);
if (_queue_pos == pos)
break;
p = _cmd_queue[pos].array;
@@ -460,7 +460,7 @@
a = _cmd_queue[i].array;
if (a[0] == COMMAND_ID && a[1] == 8 && a[2] == (uint16)sound)
return 2;
- i = (i + 1) &(ARRAYSIZE(_cmd_queue) - 1);
+ i = (i + 1) & (ARRAYSIZE(_cmd_queue) - 1);
}
for (i = 0; i < ARRAYSIZE (_deferredCommands); ++i) {
@@ -550,13 +550,13 @@
p[6] = f;
p[7] = g;
- i = (i + 1) &(ARRAYSIZE(_cmd_queue) - 1);
+ i = (i + 1) & (ARRAYSIZE(_cmd_queue) - 1);
if (_queue_end != i) {
_queue_pos = i;
return 0;
} else {
- _queue_pos = (i - 1) &(ARRAYSIZE(_cmd_queue) - 1);
+ _queue_pos = (i - 1) & (ARRAYSIZE(_cmd_queue) - 1);
return -1;
}
}
@@ -644,9 +644,9 @@
p[1] = sound;
p[2] = marker;
- pos = (pos + 1) &(ARRAYSIZE(_cmd_queue) - 1);
+ pos = (pos + 1) & (ARRAYSIZE(_cmd_queue) - 1);
if (_queue_end == pos) {
- _queue_pos = (pos - 1) &(ARRAYSIZE(_cmd_queue) - 1);
+ _queue_pos = (pos - 1) & (ARRAYSIZE(_cmd_queue) - 1);
return -1;
}
@@ -667,27 +667,28 @@
args[5] = f;
args[6] = g;
args[7] = h;
- return doCommand (8, args);
+ return doCommand(8, args);
}
-int32 IMuseInternal::doCommand (int numargs, int a[]) {
+int32 IMuseInternal::doCommand(int numargs, int a[]) {
int i;
- if (numargs < 1) return -1;
+ if (numargs < 1)
+ return -1;
byte cmd = a[0] & 0xFF;
byte param = a[0] >> 8;
Player *player = NULL;
- if (!_initialized &&(cmd || param))
+ if (!_initialized && (cmd || param))
return -1;
#ifdef IMUSE_DEBUG
{
char string[128];
- sprintf (string, "doCommand - %d (%d/%d)", a[0], (int) param, (int) cmd);
+ sprintf (string, "doCommand - %d (%d/%d)", a[0], (int)param, (int)cmd);
for (i = 1; i < numargs; ++i)
- sprintf (string + strlen(string), ", %d", a[i]);
- debug (0, string);
+ sprintf(string + strlen(string), ", %d", a[i]);
+ debug(0, string);
}
#endif
@@ -697,11 +698,11 @@
if (a[1] > 127)
return -1;
else {
- warning ("IMuse doCommand(6) - setImuseMasterVolume (%d)", a[1]);
+ warning("IMuse doCommand(6) - setImuseMasterVolume (%d)", a[1]);
return setImuseMasterVolume((a[1] << 1) |(a[1] ? 0 : 1)); // Convert from 0-127 to 0-255
}
case 7:
- warning ("IMuse doCommand(7) - getMasterVolume (%d)", a[1]);
+ warning("IMuse doCommand(7) - getMasterVolume (%d)", a[1]);
return _master_volume / 2; // Convert from 0-255 to 0-127
case 8:
return startSound(a[1]) ? 0 : -1;
@@ -743,19 +744,19 @@
}
return -1;
case 16:
- warning ("IMuse doCommand(16) - set_volchan (%d, %d)", a[1], a[2]);
+ warning("IMuse doCommand(16) - set_volchan (%d, %d)", a[1], a[2]);
return set_volchan(a[1], a[2]);
case 17:
if (g_scumm->_gameId != GID_SAMNMAX) {
- warning ("IMuse doCommand(17) - set_channel_volume (%d, %d)", a[1], a[2]);
+ warning("IMuse doCommand(17) - set_channel_volume (%d, %d)", a[1], a[2]);
return set_channel_volume(a[1], a[2]);
} else {
if (a[4]) {
int b[16];
- memset (b, 0, sizeof(b));
+ memset(b, 0, sizeof(b));
for (i = 0; i < numargs; ++i)
b[i] = a[i];
- return ImSetTrigger (b[1], b[3], b[4], b[5], b[6], b[7], b[8], b[9], b[10], b[11]);
+ return ImSetTrigger(b[1], b[3], b[4], b[5], b[6], b[7], b[8], b[9], b[10], b[11]);
} else {
return ImClearTrigger(a[1], a[3]);
}
@@ -771,8 +772,8 @@
// trigger ID.
a[0] = 0;
for (i = 0; i < 16; ++i) {
- if (_snm_triggers [i].sound == a[1] && _snm_triggers [i].id &&
- (a[3] == -1 || _snm_triggers [i].id == a[3]))
+ if (_snm_triggers[i].sound == a[1] && _snm_triggers[i].id &&
+ (a[3] == -1 || _snm_triggers[i].id == a[3]))
{
++a[0];
}
@@ -795,13 +796,13 @@
warning("doCommand(%d [%d/%d], %d, %d, %d, %d, %d, %d, %d) unsupported", a[0], param, cmd, a[1], a[2], a[3], a[4], a[5], a[6], a[7]);
}
} else if (param == 1) {
- if ((1 << cmd) &(0x783FFF)) {
+ if ((1 << cmd) & 0x783FFF) {
player = findActivePlayer(a[1]);
if (!player)
return -1;
- if ((1 << cmd) &(1 << 11 | 1 << 22)) {
+ if ((1 << cmd) & (1 << 11 | 1 << 22)) {
assert(a[2] >= 0 && a[2] <= 15);
- player = (Player *) player->getPart(a[2]);
+ player = (Player *)player->getPart(a[2]);
if (!player)
return -1;
}
@@ -852,7 +853,7 @@
case 12:
return player->setHook(a[2], a[3], a[4]);
case 13:
- return player->addParameterFader (ParameterFader::pfVolume, a[2], a[3]);
+ return player->addParameterFader(ParameterFader::pfVolume, a[2], a[3]);
case 14:
return enqueue_trigger(a[1], a[2]);
case 15:
@@ -881,7 +882,7 @@
return -1;
}
-int32 IMuseInternal::ImSetTrigger (int sound, int id, int a, int b, int c, int d, int e, int f, int g, int h) {
+int32 IMuseInternal::ImSetTrigger(int sound, int id, int a, int b, int c, int d, int e, int f, int g, int h) {
// Sam & Max: ImSetTrigger.
// Sets a trigger for a particular player and
// marker ID, along with doCommand parameters
@@ -921,22 +922,22 @@
trig->id = id;
trig->sound = sound;
trig->expire = (++_snm_trigger_index & 0xFFFF);
- trig->command [0] = a;
- trig->command [1] = b;
- trig->command [2] = c;
- trig->command [3] = d;
- trig->command [4] = e;
- trig->command [5] = f;
- trig->command [6] = g;
- trig->command [7] = h;
+ trig->command[0] = a;
+ trig->command[1] = b;
+ trig->command[2] = c;
+ trig->command[3] = d;
+ trig->command[4] = e;
+ trig->command[5] = f;
+ trig->command[6] = g;
+ trig->command[7] = h;
// If the command is to start a sound, stop that sound if it's already playing.
// This fixes some carnival music problems.
// NOTE: We ONLY do this if the sound that will trigger the command is actually
// playing. Otherwise, there's a problem when exiting and re-entering the
// Bumpusville mansion. Ref Bug #780918.
- if (trig->command [0] == 8 && getSoundStatus(trig->command [1]) && getSoundStatus (sound))
- stopSound(trig->command [1]);
+ if (trig->command[0] == 8 && getSoundStatus(trig->command[1]) && getSoundStatus(sound))
+ stopSound(trig->command[1]);
return 0;
}
@@ -954,13 +955,14 @@
}
int32 IMuseInternal::ImFireAllTriggers(int sound) {
- if (!sound) return 0;
+ if (!sound)
+ return 0;
int count = 0;
int i;
- for (i = 0; i < 16; ++i) {
- if (_snm_triggers [i].sound == sound) {
- _snm_triggers [i].sound = _snm_triggers [i].id = 0;
- doCommand (8, _snm_triggers[i].command);
+ for (i = 0; i < ARRAYSIZE(_snm_triggers); ++i) {
+ if (_snm_triggers[i].sound == sound) {
+ _snm_triggers[i].sound = _snm_triggers[i].id = 0;
+ doCommand(8, _snm_triggers[i].command);
++count;
}
}
@@ -1085,7 +1087,7 @@
case IMuse::PROP_NATIVE_MT32:
_native_mt32 = (value > 0);
Instrument::nativeMT32(_native_mt32);
- if (_midi_native && _native_mt32)
+ if (_midi_native && _native_mt32)
initMT32(_midi_native);
break;
@@ -1104,7 +1106,7 @@
case IMuse::PROP_LIMIT_PLAYERS:
if (value > 0 && value <= ARRAYSIZE(_players))
- _player_limit = (int) value;
+ _player_limit = (int)value;
break;
case IMuse::PROP_RECYCLE_PLAYERS:
@@ -1139,7 +1141,8 @@
if (adlib_midi != NULL)
initMidiDriver(adlib_midi);
- if (!_tempoFactor) _tempoFactor = 100;
+ if (!_tempoFactor)
+ _tempoFactor = 100;
_master_volume = 255;
for (i = 0; i != 8; i++)
@@ -1172,7 +1175,7 @@
// Reset the MT-32
memcpy(&buffer[0], "\x41\x10\x16\x12\x7f\x00\x00\x01\x00", 9);
midi->sysEx(buffer, 9);
- g_system->delayMillis (100);
+ g_system->delayMillis(100);
// Compute version string (truncated to 20 chars max.)
strcat(info, gScummVMVersion);
@@ -1189,18 +1192,18 @@
checksum -= buffer[i];
buffer[27] = checksum & 0x7F;
midi->sysEx(buffer, 28);
- g_system->delayMillis (500);
+ g_system->delayMillis(500);
// Setup master tune, reverb mode, reverb time, reverb level,
// channel mapping, partial reserve and master volume
memcpy(&buffer[4], "\x10\x00\x00\x40\x00\x04\x04\x04\x04\x04\x04\x04\x04\x04\x04\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x64\x77", 27);
midi->sysEx(buffer, 31);
- g_system->delayMillis (250);
+ g_system->delayMillis(250);
// Map percussion to notes 24 - 34 without reverb
memcpy(&buffer[4], "\x03\x01\x10\x40\x64\x07\x00\x4a\x64\x06\x00\x41\x64\x07\x00\x4b\x64\x08\x00\x45\x64\x06\x00\x44\x64\x0b\x00\x51\x64\x05\x00\x43\x64\x08\x00\x50\x64\x07\x00\x42\x64\x03\x00\x4c\x64\x07\x00\x44", 48);
midi->sysEx(buffer, 52);
- g_system->delayMillis (250);
+ g_system->delayMillis(250);
}
void IMuseInternal::initGM(MidiDriver *midi) {
@@ -1211,7 +1214,7 @@
memcpy(&buffer[0], "\xF0\x7E\x7F\x09\x01\xF7", 6);
midi->sysEx(buffer, 6);
debug(2, "GM SysEx: GM System On");
- g_system->delayMillis (200);
+ g_system->delayMillis(200);
if (_enable_gs) {
@@ -1229,7 +1232,7 @@
memcpy(&buffer[5], "\x40\x00\x7F\x00\x41\xF7", 6);
midi->sysEx(buffer, 11);
debug(2, "GS SysEx: GS Reset");
- g_system->delayMillis (200);
+ g_system->delayMillis(200);
if (_sc55) {
@@ -1251,7 +1254,7 @@
// Switch Drum Map to CM-64/32L (MT-32 Compatible Drums)
midi->getPercussionChannel()->controlChange(0, 0);
midi->getPercussionChannel()->controlChange(32, 1);
- midi->send (127 << 8 | 0xC0 | 9);
+ midi->send(127 << 8 | 0xC0 | 9);
debug(2, "GS Program Change: Drum Map is CM-64/32L");
}
@@ -1371,7 +1374,7 @@
// just send AllNotesOff to the channels.
if (_midi_native && _native_mt32) {
for (int i = 0; i < 16; ++i)
- _midi_native->send (123 << 8 | 0xB0 | i);
+ _midi_native->send(123 << 8 | 0xB0 | i);
}
_paused = paused;
@@ -1601,7 +1604,7 @@
sendPitchBend();
}
-void Part::volume (byte value) {
+void Part::volume(byte value) {
_vol_eff = ((_vol = value) + 1) * _player->getEffectiveVolume() >> 7;
if (_mc)
_mc->volume(_vol_eff);
@@ -1700,7 +1703,7 @@
if (_unassigned_instrument && !_percussion) {
_unassigned_instrument = false;
if (!_instrument.isValid()) {
- warning("[%02d] No instrument specified", (int) _chan);
+ warning("[%02d] No instrument specified", (int)_chan);
return;
}
}
@@ -1787,13 +1790,16 @@
}
bool Part::clearToTransmit() {
- if (_mc) return true;
- if (_instrument.isValid()) _player->_se->reallocateMidiChannels(_player->getMidiDriver());
+ if (_mc)
+ return true;
+ if (_instrument.isValid())
+ _player->_se->reallocateMidiChannels(_player->getMidiDriver());
return false;
}
void Part::sendAll() {
- if (!clearToTransmit()) return;
+ if (!clearToTransmit())
+ return;
_mc->pitchBendFactor(_pitchbend_factor);
sendPitchBend();
_mc->volume(_vol_eff);
@@ -1826,8 +1832,8 @@
void Part::set_instrument(uint b) {
_bank = (byte)(b >> 8);
if (_bank)
- warning ("Non-zero instrument bank selection. Please report this");
- _instrument.program((byte) b, _player->isMT32());
+ warning("Non-zero instrument bank selection. Please report this");
+ _instrument.program((byte)b, _player->isMT32());
if (clearToTransmit())
_instrument.send(_mc);
}
@@ -1845,7 +1851,7 @@
////////////////////////////////////////
void IMuseInternal::midiTimerCallback(void *data) {
- MidiDriver *driver = (MidiDriver *) data;
+ MidiDriver *driver = (MidiDriver *)data;
if (g_scumm->_imuse)
g_scumm->_imuse->on_timer(driver);
}
@@ -1931,8 +1937,8 @@
int IMuse::getSoundStatus(int sound) const { in(); int ret = _target->getSoundStatus(sound, true); out(); return ret; }
bool IMuse::get_sound_active(int sound) const { in(); bool ret = _target->getSoundStatus(sound, false) ? 1 : 0; out(); return ret; }
int IMuse::getMusicTimer() const { in(); int ret = _target->getMusicTimer(); out(); return ret; }
-int32 IMuse::doCommand (int a, int b, int c, int d, int e, int f, int g, int h) { in(); int32 ret = _target->doCommand(a,b,c,d,e,f,g,h); out(); return ret; }
-int32 IMuse::doCommand (int numargs, int args[]) { in(); int32 ret = _target->doCommand (numargs, args); out(); return ret; }
+int32 IMuse::doCommand(int a, int b, int c, int d, int e, int f, int g, int h) { in(); int32 ret = _target->doCommand(a,b,c,d,e,f,g,h); out(); return ret; }
+int32 IMuse::doCommand(int numargs, int args[]) { in(); int32 ret = _target->doCommand(numargs, args); out(); return ret; }
int IMuse::clear_queue() { in(); int ret = _target->clear_queue(); out(); return ret; }
void IMuse::setBase(byte **base) { in(); _target->setBase(base); out(); }
uint32 IMuse::property(int prop, uint32 value) { in(); uint32 ret = _target->property(prop, value); out(); return ret; }
Index: imuse.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.h,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- imuse.h 13 Apr 2005 00:11:42 -0000 1.59
+++ imuse.h 26 May 2005 11:13:42 -0000 1.60
@@ -68,8 +68,8 @@
int getSoundStatus(int sound) const;
bool get_sound_active(int sound) const;
int getMusicTimer() const;
- int32 doCommand (int a, int b, int c, int d, int e, int f, int g, int h);
- int32 doCommand (int numargs, int args[]);
+ int32 doCommand(int a, int b, int c, int d, int e, int f, int g, int h);
+ int32 doCommand(int numargs, int args[]);
int clear_queue();
void setBase(byte **base);
uint32 property(int prop, uint32 value);
Index: imuse_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_player.cpp,v
retrieving revision 2.50
retrieving revision 2.51
diff -u -d -r2.50 -r2.51
--- imuse_player.cpp 25 May 2005 19:39:11 -0000 2.50
+++ imuse_player.cpp 26 May 2005 11:13:42 -0000 2.51
@@ -130,7 +130,7 @@
}
#ifdef IMUSE_DEBUG
- debug (0, "Starting music %d", sound);
+ debug(0, "Starting music %d", sound);
#endif
return true;
}
@@ -155,7 +155,7 @@
return;
#ifdef IMUSE_DEBUG
- debug (0, "Stopping music %d", _id);
+ debug(0, "Stopping music %d", _id);
#endif
if (_parser) {
@@ -192,10 +192,10 @@
if (_parser)
delete _parser;
- if (!memcmp (ptr, "RO", 2)) {
+ if (!memcmp(ptr, "RO", 2)) {
// Old style 'RO' resource
_parser = MidiParser_createRO();
- } else if (!memcmp (ptr, "SO", 2)) {
+ } else if (!memcmp(ptr, "SO", 2)) {
// Euphony (FM-TOWNS) resource
_parser = MidiParser_createEUP();
} else if (!memcmp(ptr, "FORM", 4)) {
@@ -234,7 +234,7 @@
void Player::send(uint32 b) {
if (_passThrough) {
- _midi->send (b);
+ _midi->send(b);
return;
}
@@ -351,7 +351,7 @@
Part *part;
if (_passThrough) {
- _midi->sysEx (p, len);
+ _midi->sysEx(p, len);
return;
}
@@ -369,9 +369,9 @@
}
} else if (a == YM2612_SYSEX_ID) {
// FM-TOWNS custom instrument definition
- _midi->sysEx_customInstrument (p[0], 'EUP ', p + 1);
+ _midi->sysEx_customInstrument(p[0], 'EUP ', p + 1);
} else {
- warning("Unknown SysEx manufacturer 0x%02X", (int) a);
+ warning("Unknown SysEx manufacturer 0x%02X", (int)a);
}
return;
}
@@ -412,7 +412,7 @@
part = getPart(p[0] & 0x0F);
if (part) {
part->set_onoff(p[2] & 0x01);
- part->set_pri (p[4]);
+ part->set_pri(p[4]);
part->volume((p[5] & 0x0F) << 4 |(p[6] & 0x0F));
part->_percussion = _isMIDI ? ((p[9] & 0x08) > 0) : false;
if (part->_percussion) {
@@ -438,11 +438,11 @@
// ID and marker ID match what was set by ImSetTrigger,
// something magical is supposed to happen....
for (a = 0; a < 16; ++a) {
- if (_se->_snm_triggers [a].sound == _id &&
- _se->_snm_triggers [a].id == *p)
+ if (_se->_snm_triggers[a].sound == _id &&
+ _se->_snm_triggers[a].id == *p)
{
- _se->_snm_triggers [a].sound = _se->_snm_triggers [a].id = 0;
- _se->doCommand (8, _se->_snm_triggers[a].command);
+ _se->_snm_triggers[a].sound = _se->_snm_triggers[a].id = 0;
+ _se->doCommand(8, _se->_snm_triggers[a].command);
break;
}
}
@@ -466,7 +466,7 @@
if (part) {
if (len == 63) {
decode_sysex_bytes(p, buf, len - 3);
- part->set_instrument((byte *) buf);
+ part->set_instrument((byte *)buf);
} else {
// SPK tracks have len == 49 here, and are not supported
part->programChange(254); // Must be invalid, but not 255 (which is reserved)
@@ -553,13 +553,13 @@
break;
default:
- warning("Unknown SysEx command %d", (int) code);
+ warning("Unknown SysEx command %d", (int)code);
}
}
void Player::decode_sysex_bytes(const byte *src, byte *dst, int len) {
while (len >= 0) {
- *dst++ = ((src[0] << 4)&0xFF) |(src[1] & 0xF);
+ *dst++ = ((src[0] << 4)&0xFF) | (src[1] & 0xF);
src += 2;
len -= 2;
}
@@ -835,7 +835,7 @@
// the current track so that our state when starting the
// new track is fully up to date.
if (totrack != _track_index)
- _parser->jumpToTick ((uint32) -1, true);
+ _parser->jumpToTick((uint32)-1, true);
_parser->setTrack(totrack);
if (!_parser->jumpToTick((tobeat - 1) * TICKS_PER_BEAT + totick, true)) {
_scanning = false;
@@ -867,11 +867,11 @@
Part *part;
for (i = 0; i < 16; ++i) {
- part = getPart (i);
+ part = getPart(i);
mask = 1 << i;
for (j = 0; j < 128; ++j) {
if (_active_notes[j] & mask)
- part->noteOn (j, 80);
+ part->noteOn(j, 80);
}
}
}
@@ -1064,7 +1064,7 @@
if (!time)
best->total_time = 1;
else
- best->total_time = (uint32) time * 10000;
+ best->total_time = (uint32)time * 10000;
best->current_time = 0;
} else {
warning("IMuse Player %d: Out of parameter faders", _id);
@@ -1087,7 +1087,7 @@
ptr->current_time += advance;
if (ptr->current_time > ptr->total_time)
ptr->current_time = ptr->total_time;
- value = (int32) ptr->start +(int32)(ptr->end - ptr->start) *(int32) ptr->current_time /(int32) ptr->total_time;
+ value = (int32)ptr->start + (int32)(ptr->end - ptr->start) * (int32)ptr->current_time / (int32)ptr->total_time;
switch (ptr->param) {
case ParameterFader::pfVolume:
@@ -1096,18 +1096,18 @@
clear();
return;
}
- setVolume((byte) value);
+ setVolume((byte)value);
break;
case ParameterFader::pfTranspose:
// FIXME: Is this really transpose?
- setTranspose (0, value / 100);
- setDetune (value % 100);
+ setTranspose(0, value / 100);
+ setDetune(value % 100);
break;
case ParameterFader::pfSpeed: // impSpeed:
// Speed.
- setSpeed((byte) value);
+ setSpeed((byte)value);
break;
default:
More information about the Scummvm-git-logs
mailing list