diff options
author | Max Horn | 2011-03-25 11:15:06 +0100 |
---|---|---|
committer | Max Horn | 2011-03-25 14:15:51 +0100 |
commit | 61ff5de0cfb286443e0554d83ad74ee3577c51ae (patch) | |
tree | 99b2ec70c81b0f30a253f25bcb961d029d02cb3a /audio | |
parent | 9ffc4e015138098fa21d234bb195c99a29b17380 (diff) | |
download | scummvm-rg350-61ff5de0cfb286443e0554d83ad74ee3577c51ae.tar.gz scummvm-rg350-61ff5de0cfb286443e0554d83ad74ee3577c51ae.tar.bz2 scummvm-rg350-61ff5de0cfb286443e0554d83ad74ee3577c51ae.zip |
AUDIO: Rename 'channel' to 'ch'
Diffstat (limited to 'audio')
-rw-r--r-- | audio/midiplayer.cpp | 19 | ||||
-rw-r--r-- | audio/midiplayer.h | 2 |
2 files changed, 11 insertions, 10 deletions
diff --git a/audio/midiplayer.cpp b/audio/midiplayer.cpp index 12d03d73f8..d797ba281d 100644 --- a/audio/midiplayer.cpp +++ b/audio/midiplayer.cpp @@ -75,32 +75,33 @@ void MidiPlayer::syncVolume() { void MidiPlayer::send(uint32 b) { - byte channel = (byte)(b & 0x0F); + byte ch = (byte)(b & 0x0F); if ((b & 0xFFF0) == 0x07B0) { // Adjust volume changes by master volume byte volume = (byte)((b >> 16) & 0x7F); - _channelsVolume[channel] = volume; + _channelsVolume[ch] = volume; volume = volume * _masterVolume / 255; b = (b & 0xFF00FFFF) | (volume << 16); } else if ((b & 0xFFF0) == 0x007BB0) { // Only respond to All Notes Off if this channel // has currently been allocated - if (!_channelsTable[channel]) + if (!_channelsTable[ch]) return; } - sendToChannel(channel, b); + sendToChannel(ch, b); } -void MidiPlayer::sendToChannel(byte channel, uint32 b) { - if (!_channelsTable[channel]) { - _channelsTable[channel] = (channel == 9) ? _driver->getPercussionChannel() : _driver->allocateChannel(); +void MidiPlayer::sendToChannel(byte ch, uint32 b) { + if (!_channelsTable[ch]) { + _channelsTable[ch] = (ch == 9) ? _driver->getPercussionChannel() : _driver->allocateChannel(); // TODO: Some engines overload this method to insert code at this // point which calls the channel's volume() method. // Does this make sense, and should we maybe do it in general? } - if (_channelsTable[channel]) - _channelsTable[channel]->send(b); + if (_channelsTable[ch]) { + _channelsTable[ch]->send(b); + } } void MidiPlayer::metaEvent(byte type, byte *data, uint16 length) { diff --git a/audio/midiplayer.h b/audio/midiplayer.h index fd60d0bc07..7815489e0d 100644 --- a/audio/midiplayer.h +++ b/audio/midiplayer.h @@ -85,7 +85,7 @@ public: * This method is invoked by send() after suitably filtering * the message b. */ - virtual void sendToChannel(byte channel, uint32 b); + virtual void sendToChannel(byte ch, uint32 b); /** * This method is invoked by metaEvent when an end-of-track |