aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2010-06-03 23:07:53 +0000
committerJohannes Schickel2010-06-03 23:07:53 +0000
commit02ed1a684ae54b1ae3124aa3064889164e33ed69 (patch)
tree0901b20378d9f4483716f1bb2ce81e96ebd0e832
parent8dd7537a55add13179520ec751641baac47373c7 (diff)
downloadscummvm-rg350-02ed1a684ae54b1ae3124aa3064889164e33ed69.tar.gz
scummvm-rg350-02ed1a684ae54b1ae3124aa3064889164e33ed69.tar.bz2
scummvm-rg350-02ed1a684ae54b1ae3124aa3064889164e33ed69.zip
- Made some methods const
- Prefer const_iterator over iterator in SciMusic::findUsedChannels svn-id: r49417
-rw-r--r--engines/sci/sound/midiparser_sci.h2
-rw-r--r--engines/sci/sound/music.cpp4
-rw-r--r--engines/sci/sound/music.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/engines/sci/sound/midiparser_sci.h b/engines/sci/sound/midiparser_sci.h
index d9ae583aff..e33e613dd6 100644
--- a/engines/sci/sound/midiparser_sci.h
+++ b/engines/sci/sound/midiparser_sci.h
@@ -78,7 +78,7 @@ public:
}
protected:
- bool isChannelUsed(byte channel) { return _channelsUsed & (1 << channel); }
+ bool isChannelUsed(byte channel) const { return _channelsUsed & (1 << channel); }
void setChannelUsed(byte channel) { _channelsUsed |= (1 << channel); }
void parseNextEvent(EventInfo &info);
diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp
index 1d186647f8..e1300373e7 100644
--- a/engines/sci/sound/music.cpp
+++ b/engines/sci/sound/music.cpp
@@ -179,8 +179,8 @@ void SciMusic::findUsedChannels() {
for (int k = 0; k < 16; k++)
_usedChannels[k] = false;
- const MusicList::iterator end = _playList.end();
- for (MusicList::iterator i = _playList.begin(); i != end; ++i) {
+ const MusicList::const_iterator end = _playList.end();
+ for (MusicList::const_iterator i = _playList.begin(); i != end; ++i) {
for (int channel = 0; channel < 16; channel++) {
if ((*i)->soundRes && (*i)->soundRes->isChannelUsed(channel))
_usedChannels[channel] = true;
diff --git a/engines/sci/sound/music.h b/engines/sci/sound/music.h
index f5eb7ce8d9..83cd59e89b 100644
--- a/engines/sci/sound/music.h
+++ b/engines/sci/sound/music.h
@@ -211,7 +211,7 @@ protected:
private:
static void miditimerCallback(void *p);
void findUsedChannels();
- int16 getNextUnusedChannel() {
+ int16 getNextUnusedChannel() const {
for (int i = 0; i < 16; i++) {
if (!_usedChannels[i])
return i;