[Scummvm-cvs-logs] SF.net SVN: scummvm:[49417] scummvm/trunk/engines/sci/sound

[lordhoto at users.sourceforge.net]

Revision: 49417
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49417&view=rev
Author:   lordhoto
Date:     2010-06-03 23:07:53 +0000 (Thu, 03 Jun 2010)

Log Message:
-----------
- Made some methods const
- Prefer const_iterator over iterator in SciMusic::findUsedChannels

Modified Paths:
--------------
    scummvm/trunk/engines/sci/sound/midiparser_sci.h
    scummvm/trunk/engines/sci/sound/music.cpp
    scummvm/trunk/engines/sci/sound/music.h

Modified: scummvm/trunk/engines/sci/sound/midiparser_sci.h
===================================================================
--- scummvm/trunk/engines/sci/sound/midiparser_sci.h	2010-06-03 22:13:23 UTC (rev 49416)
+++ scummvm/trunk/engines/sci/sound/midiparser_sci.h	2010-06-03 23:07:53 UTC (rev 49417)
@@ -78,7 +78,7 @@
 	}
 
 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);

Modified: scummvm/trunk/engines/sci/sound/music.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/music.cpp	2010-06-03 22:13:23 UTC (rev 49416)
+++ scummvm/trunk/engines/sci/sound/music.cpp	2010-06-03 23:07:53 UTC (rev 49417)
@@ -179,8 +179,8 @@
 	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;

Modified: scummvm/trunk/engines/sci/sound/music.h
===================================================================
--- scummvm/trunk/engines/sci/sound/music.h	2010-06-03 22:13:23 UTC (rev 49416)
+++ scummvm/trunk/engines/sci/sound/music.h	2010-06-03 23:07:53 UTC (rev 49417)
@@ -211,7 +211,7 @@
 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;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.