[Scummvm-cvs-logs] CVS: scummvm/scumm imuse.h,1.47,1.48 imuse.cpp,2.102,2.103 imuse_player.cpp,2.33,2.34 imuse_internal.h,2.27,2.28
Max Horn
fingolfin at users.sourceforge.net
Thu Oct 2 18:00:03 CEST 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/backends/sdl sdl-common.cpp,1.90,1.91
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm music.h,2.6,2.7 resource_v2.cpp,1.34,1.35 scumm.h,1.307,1.308 scummvm.cpp,2.412,2.413
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv8590
Modified Files:
imuse.h imuse.cpp imuse_player.cpp imuse_internal.h
Log Message:
const as const can
Index: imuse.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.h,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- imuse.h 2 Oct 2003 22:42:02 -0000 1.47
+++ imuse.h 3 Oct 2003 00:59:27 -0000 1.48
@@ -68,7 +68,7 @@
void stopAllSounds();
int getSoundStatus(int sound) const;
bool get_sound_active(int sound) const;
- int getMusicTimer();
+ int getMusicTimer() const;
int32 doCommand (int a, int b, int c, int d, int e, int f, int g, int h);
int32 doCommand (int numargs, int args[]);
int clear_queue();
Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.cpp,v
retrieving revision 2.102
retrieving revision 2.103
diff -u -d -r2.102 -r2.103
--- imuse.cpp 2 Oct 2003 22:42:02 -0000 2.102
+++ imuse.cpp 3 Oct 2003 00:59:27 -0000 2.103
@@ -324,9 +324,9 @@
sequencer_timers(midi);
}
-int IMuseInternal::getMusicTimer() {
+int IMuseInternal::getMusicTimer() const {
int best_time = 0;
- Player *player = _players;
+ const Player *player = _players;
int i;
for (i = ARRAYSIZE(_players); i != 0; i--, player++) {
@@ -1767,7 +1767,7 @@
void IMuse::stopAllSounds() { in(); _target->stopAllSounds(); out(); }
int IMuse::getSoundStatus(int sound) const { in(); int ret = _target->getSoundStatus(sound, true); out(); return ret; }
bool IMuse::get_sound_active(int sound) const { in(); bool ret = _target->getSoundStatus(sound, false) ? 1 : 0; out(); return ret; }
-int IMuse::getMusicTimer() { in(); int ret = _target->getMusicTimer(); out(); return ret; }
+int IMuse::getMusicTimer() const { in(); int ret = _target->getMusicTimer(); out(); return ret; }
int32 IMuse::doCommand (int a, int b, int c, int d, int e, int f, int g, int h) { in(); int32 ret = _target->doCommand(a,b,c,d,e,f,g,h); out(); return ret; }
int32 IMuse::doCommand (int numargs, int args[]) { in(); int32 ret = _target->doCommand (numargs, args); out(); return ret; }
int IMuse::clear_queue() { in(); int ret = _target->clear_queue(); out(); return ret; }
Index: imuse_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_player.cpp,v
retrieving revision 2.33
retrieving revision 2.34
diff -u -d -r2.33 -r2.34
--- imuse_player.cpp 29 Sep 2003 08:09:38 -0000 2.33
+++ imuse_player.cpp 3 Oct 2003 00:59:27 -0000 2.34
@@ -127,7 +127,7 @@
return true;
}
-int Player::getMusicTimer() {
+int Player::getMusicTimer() const {
return _parser ? (_parser->getTick() * 2 / _parser->getPPQN()) : 0;
}
Index: imuse_internal.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_internal.h,v
retrieving revision 2.27
retrieving revision 2.28
diff -u -d -r2.27 -r2.28
--- imuse_internal.h 2 Oct 2003 22:42:02 -0000 2.27
+++ imuse_internal.h 3 Oct 2003 00:59:27 -0000 2.28
@@ -257,7 +257,7 @@
int setTranspose(byte relative, int b);
int setVolume(byte vol);
bool startSound(int sound, MidiDriver *midi);
- int getMusicTimer();
+ int getMusicTimer() const;
public:
// MidiDriver interface
@@ -460,7 +460,7 @@
int stopSound(int sound);
int stopAllSounds();
int getSoundStatus(int sound, bool ignoreFadeouts = true) const;
- int getMusicTimer();
+ int getMusicTimer() const;
int32 doCommand (int a, int b, int c, int d, int e, int f, int g, int h);
int32 doCommand (int numargs, int args[]);
int clear_queue();
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/backends/sdl sdl-common.cpp,1.90,1.91
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm music.h,2.6,2.7 resource_v2.cpp,1.34,1.35 scumm.h,1.307,1.308 scummvm.cpp,2.412,2.413
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list