[Scummvm-cvs-logs] SF.net SVN: scummvm:[46276] scummvm/trunk/engines/sci/sfx
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Mon Dec 7 13:36:09 CET 2009
Revision: 46276
http://scummvm.svn.sourceforge.net/scummvm/?rev=46276&view=rev
Author: thebluegr
Date: 2009-12-07 12:36:09 +0000 (Mon, 07 Dec 2009)
Log Message:
-----------
Slight cleanup/simplification of the TimerSongIterator
Modified Paths:
--------------
scummvm/trunk/engines/sci/sfx/iterator.cpp
scummvm/trunk/engines/sci/sfx/iterator_internal.h
Modified: scummvm/trunk/engines/sci/sfx/iterator.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/iterator.cpp 2009-12-07 12:34:38 UTC (rev 46275)
+++ scummvm/trunk/engines/sci/sfx/iterator.cpp 2009-12-07 12:36:09 UTC (rev 46276)
@@ -1169,10 +1169,6 @@
/**********************/
/*-- Timer iterator --*/
/**********************/
-TimerSongIterator::TimerSongIterator(int delta)
- : _delta(delta) {
-}
-
int TimerSongIterator::nextCommand(byte *buf, int *result) {
if (_delta) {
int d = _delta;
@@ -1182,23 +1178,6 @@
return SI_FINISHED;
}
-SongIterator *TimerSongIterator::handleMessage(Message msg) {
- return NULL;
-}
-
-int TimerSongIterator::getTimepos() {
- return 0;
-}
-
-Audio::AudioStream *TimerSongIterator::getAudioStream() {
- return NULL;
-}
-
-SongIterator *TimerSongIterator::clone(int delta) {
- TimerSongIterator *newit = new TimerSongIterator(*this);
- return newit;
-}
-
SongIterator *new_timer_iterator(int delta) {
return new TimerSongIterator(delta);
}
Modified: scummvm/trunk/engines/sci/sfx/iterator_internal.h
===================================================================
--- scummvm/trunk/engines/sci/sfx/iterator_internal.h 2009-12-07 12:34:38 UTC (rev 46275)
+++ scummvm/trunk/engines/sci/sfx/iterator_internal.h 2009-12-07 12:36:09 UTC (rev 46276)
@@ -190,13 +190,13 @@
int _delta; /**!< Remaining time */
public:
- TimerSongIterator(int delta);
+ TimerSongIterator(int delta) : _delta(delta) {}
int nextCommand(byte *buf, int *result);
- Audio::AudioStream *getAudioStream();
- SongIterator *handleMessage(Message msg);
- int getTimepos();
- SongIterator *clone(int delta);
+ Audio::AudioStream *getAudioStream() { return NULL; }
+ SongIterator *handleMessage(Message msg) { return NULL; }
+ int getTimepos() { return 0; }
+ SongIterator *clone(int delta) { return new TimerSongIterator(*this); }
};
/**********************************/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list