[Scummvm-cvs-logs] SF.net SVN: scummvm:[47137] scummvm/trunk/sound
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Thu Jan 7 18:45:38 CET 2010
Revision: 47137
http://scummvm.svn.sourceforge.net/scummvm/?rev=47137&view=rev
Author: lordhoto
Date: 2010-01-07 17:45:38 +0000 (Thu, 07 Jan 2010)
Log Message:
-----------
Remove setNumLoops and getNumPlayedLoops from AudioStream.
Modified Paths:
--------------
scummvm/trunk/sound/audiostream.cpp
scummvm/trunk/sound/audiostream.h
Modified: scummvm/trunk/sound/audiostream.cpp
===================================================================
--- scummvm/trunk/sound/audiostream.cpp 2010-01-07 17:45:17 UTC (rev 47136)
+++ scummvm/trunk/sound/audiostream.cpp 2010-01-07 17:45:38 UTC (rev 47137)
@@ -237,21 +237,6 @@
int getRate() const { return _rate; }
bool seek(const Timestamp &where);
Timestamp getLength() const { return _playtime; }
-
- void setNumLoops(uint numLoops) {
- _numLoops = numLoops;
- _numPlayedLoops = 0;
-
- if (numLoops == 1) {
- _loopPtr = 0;
- _loopEnd = 0;
- } else {
- _loopPtr = _ptr;
- _loopEnd = _end;
- }
- }
-
- uint getNumPlayedLoops() { return _numPlayedLoops; }
};
template<bool stereo, bool is16Bit, bool isUnsigned, bool isLE>
@@ -312,12 +297,6 @@
static const int32 BUFFER_SIZE = 16384;
#endif
- void setNumLoops(uint numLoops) {
- _numLoops = numLoops;
- _numPlayedLoops = 0;
- }
- uint getNumPlayedLoops() { return _numPlayedLoops; }
-
protected:
byte* _buffer; ///< Streaming buffer
const byte *_ptr; ///< Pointer to current position in stream buffer
Modified: scummvm/trunk/sound/audiostream.h
===================================================================
--- scummvm/trunk/sound/audiostream.h 2010-01-07 17:45:17 UTC (rev 47136)
+++ scummvm/trunk/sound/audiostream.h 2010-01-07 17:45:38 UTC (rev 47137)
@@ -83,22 +83,6 @@
* By default this maps to endOfData()
*/
virtual bool endOfStream() const { return endOfData(); }
-
- /**
- * Sets number of times the stream is supposed to get looped
- * This also resets the number of loops played counter, which
- * can be queried with getNumPlayedLoops.
- * @see getNumPlayedLoops
- *
- * @param numLoops number of loops to play, 0 - infinite
- */
- virtual void setNumLoops(uint numLoops = 1) {}
-
- /**
- * Returns number of loops the stream has played.
- * @param numLoops number of loops to play, 0 - infinite
- */
- virtual uint getNumPlayedLoops() { return 0; }
};
/**
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