aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2010-01-07 17:45:38 +0000
committerJohannes Schickel2010-01-07 17:45:38 +0000
commit127213f706bf5fff97942f9f88686c6323ad5750 (patch)
treec24b473c4854742b910396edf7895cfefc26f68f
parent20a43c638cad067e361031a5fbdbdc2497e43497 (diff)
downloadscummvm-rg350-127213f706bf5fff97942f9f88686c6323ad5750.tar.gz
scummvm-rg350-127213f706bf5fff97942f9f88686c6323ad5750.tar.bz2
scummvm-rg350-127213f706bf5fff97942f9f88686c6323ad5750.zip
Remove setNumLoops and getNumPlayedLoops from AudioStream.
svn-id: r47137
-rw-r--r--sound/audiostream.cpp21
-rw-r--r--sound/audiostream.h16
2 files changed, 0 insertions, 37 deletions
diff --git a/sound/audiostream.cpp b/sound/audiostream.cpp
index 5e6b25740f..d9042c6d07 100644
--- a/sound/audiostream.cpp
+++ b/sound/audiostream.cpp
@@ -237,21 +237,6 @@ public:
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 @@ class LinearDiskStream : public SeekableAudioStream {
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
diff --git a/sound/audiostream.h b/sound/audiostream.h
index fbb84bcf53..7c84a4cea6 100644
--- a/sound/audiostream.h
+++ b/sound/audiostream.h
@@ -83,22 +83,6 @@ public:
* 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; }
};
/**