aboutsummaryrefslogtreecommitdiff
path: root/sound/vorbis.cpp
diff options
context:
space:
mode:
authorTorbjörn Andersson2004-02-12 17:31:33 +0000
committerTorbjörn Andersson2004-02-12 17:31:33 +0000
commita8f8ceee0f14d2dd2c8e2eaf49a6f627b3353adc (patch)
tree47af280a6f8384dbf5b3cf30188455cbdc0352b9 /sound/vorbis.cpp
parent447e8d93869a614dd521644a2df62bf96859007e (diff)
downloadscummvm-rg350-a8f8ceee0f14d2dd2c8e2eaf49a6f627b3353adc.tar.gz
scummvm-rg350-a8f8ceee0f14d2dd2c8e2eaf49a6f627b3353adc.tar.bz2
scummvm-rg350-a8f8ceee0f14d2dd2c8e2eaf49a6f627b3353adc.zip
Removed now obsolete getSamplesPlayed() function. It was only ever used for
the Broken Sword cutscenes, where it didn't work very well, and was never fully implemented. svn-id: r12832
Diffstat (limited to 'sound/vorbis.cpp')
-rw-r--r--sound/vorbis.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/sound/vorbis.cpp b/sound/vorbis.cpp
index 3267080502..4c515257af 100644
--- a/sound/vorbis.cpp
+++ b/sound/vorbis.cpp
@@ -172,7 +172,6 @@ class VorbisInputStream : public AudioStream {
int16 _buffer[4096];
const int16 *_bufferEnd;
const int16 *_pos;
- int _played;
void refill();
inline bool eosIntern() const;
@@ -185,7 +184,6 @@ public:
bool isStereo() const { return _numChannels >= 2; }
int getRate() const { return ov_info(_ov_file, -1)->rate; }
- int getSamplesPlayed() const { return _played / _numChannels; }
};
@@ -196,7 +194,7 @@ public:
VorbisInputStream::VorbisInputStream(OggVorbis_File *file, int duration)
- : _ov_file(file), _bufferEnd(_buffer + ARRAYSIZE(_buffer)), _played(0) {
+ : _ov_file(file), _bufferEnd(_buffer + ARRAYSIZE(_buffer)) {
// Check the header, determine if this is a stereo stream
_numChannels = ov_info(_ov_file, -1)->channels;
@@ -218,7 +216,6 @@ inline int16 VorbisInputStream::read() {
if (_pos >= _bufferEnd) {
refill();
}
- _played++;
return sample;
}
@@ -238,7 +235,6 @@ int VorbisInputStream::readBuffer(int16 *buffer, const int numSamples) {
refill();
}
}
- _played += samples;
return samples;
}