SAGA: Rename some MusicDriver members to match Audio::MidiPlayer

2 files changed, 10 insertions, 10 deletions

diff --git a/engines/saga/music.cpp b/engines/saga/music.cpp
index 6db55c2384..8554a22d90 100644
--- a/engines/saga/music.cpp
+++ b/engines/saga/music.cpp
@@ -44,7 +44,7 @@ namespace Saga {
 #define MUSIC_SUNSPOT 26
 
 MusicDriver::MusicDriver() : _isGM(false) {
-	memset(_channel, 0, sizeof(_channel));
+	memset(_channelsTable, 0, sizeof(_channelsTable));
 	_masterVolume = 0;
 	_nativeMT32 = ConfMan.getBool("native_mt32");
 
@@ -80,8 +80,8 @@ void MusicDriver::setVolume(int volume) {
 	Common::StackLock lock(_mutex);
 
 	for (int i = 0; i < 16; ++i) {
-		if (_channel[i]) {
-			_channel[i]->volume(_channelVolume[i] * _masterVolume / 255);
+		if (_channelsTable[i]) {
+			_channelsTable[i]->volume(_channelsVolume[i] * _masterVolume / 255);
 		}
 	}
 }
@@ -91,7 +91,7 @@ void MusicDriver::send(uint32 b) {
 	if ((b & 0xFFF0) == 0x07B0) {
 		// Adjust volume changes by master volume
 		byte volume = (byte)((b >> 16) & 0x7F);
-		_channelVolume[channel] = volume;
+		_channelsVolume[channel] = volume;
 		volume = volume * _masterVolume / 255;
 		b = (b & 0xFF00FFFF) | (volume << 16);
 	} else if ((b & 0xF0) == 0xC0 && !_isGM && !isMT32()) {
@@ -100,14 +100,14 @@ void MusicDriver::send(uint32 b) {
 	} else if ((b & 0xFFF0) == 0x007BB0) {
 		// Only respond to All Notes Off if this channel
 		// has currently been allocated
-		if (!_channel[channel])
+		if (!_channelsTable[channel])
 			return;
 	}
 
-	if (!_channel[channel])
-		_channel[channel] = (channel == 9) ? _driver->getPercussionChannel() : _driver->allocateChannel();
+	if (!_channelsTable[channel])
+		_channelsTable[channel] = (channel == 9) ? _driver->getPercussionChannel() : _driver->allocateChannel();
 	else
-		_channel[channel]->send(b);
+		_channelsTable[channel]->send(b);
 }
 
 Music::Music(SagaEngine *vm, Audio::Mixer *mixer) : _vm(vm), _mixer(mixer) {
diff --git a/engines/saga/music.h b/engines/saga/music.h
index 745f322905..25b54cf826 100644
--- a/engines/saga/music.h
+++ b/engines/saga/music.h
@@ -67,10 +67,10 @@ public:
 
 protected:
 
-	MidiChannel *_channel[16];
+	MidiChannel *_channelsTable[16];
 	MidiDriver *_driver;
 	MusicType _driverType;
-	byte _channelVolume[16];
+	byte _channelsVolume[16];
 	bool _isGM;
 	bool _nativeMT32;