aboutsummaryrefslogtreecommitdiff
path: root/engines/lab/music.cpp
diff options
context:
space:
mode:
authorD G Turner2015-12-18 08:56:51 +0000
committerWillem Jan Palenstijn2015-12-23 21:34:09 +0100
commit28bfce3de7e9b0ee043b4da88975f71cd72c347b (patch)
tree25da8c3dda4cb45931150ef096768b122a81c2cf /engines/lab/music.cpp
parent9048d08a0573e97af10822976c0988546780b3db (diff)
downloadscummvm-rg350-28bfce3de7e9b0ee043b4da88975f71cd72c347b.tar.gz
scummvm-rg350-28bfce3de7e9b0ee043b4da88975f71cd72c347b.tar.bz2
scummvm-rg350-28bfce3de7e9b0ee043b4da88975f71cd72c347b.zip
LAB: Correct variable shadows function compiler warning.
Diffstat (limited to 'engines/lab/music.cpp')
-rw-r--r--engines/lab/music.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/lab/music.cpp b/engines/lab/music.cpp
index aa34b7f6b4..18a5cc3587 100644
--- a/engines/lab/music.cpp
+++ b/engines/lab/music.cpp
@@ -78,11 +78,11 @@ void Music::updateMusic() {
fillbuffer(musicBuffer);
// Queue a music block, and start the music, if needed
- bool startMusic = false;
+ bool startMusicFlag = false;
if (!_queuingAudioStream) {
_queuingAudioStream = Audio::makeQueuingAudioStream(SAMPLESPEED, false);
- startMusic = true;
+ startMusicFlag = true;
}
byte soundFlags = Audio::FLAG_LITTLE_ENDIAN;
@@ -93,7 +93,7 @@ void Music::updateMusic() {
_queuingAudioStream->queueBuffer(musicBuffer, MUSICBUFSIZE, DisposeAfterUse::YES, soundFlags);
- if (startMusic)
+ if (startMusicFlag)
_vm->_mixer->playStream(Audio::Mixer::kMusicSoundType, &_musicHandle, _queuingAudioStream);
}
}