diff options
author | Johannes Schickel | 2010-01-06 15:40:49 +0000 |
---|---|---|
committer | Johannes Schickel | 2010-01-06 15:40:49 +0000 |
commit | 297a95557946555e5cc51279abafc0dc362af5f7 (patch) | |
tree | 13d590541d406dd55878221d3908feba3b6558e3 /engines/kyra | |
parent | e72707b04e2080c6f780fed54df3a57ce3c6d460 (diff) | |
download | scummvm-rg350-297a95557946555e5cc51279abafc0dc362af5f7.tar.gz scummvm-rg350-297a95557946555e5cc51279abafc0dc362af5f7.tar.bz2 scummvm-rg350-297a95557946555e5cc51279abafc0dc362af5f7.zip |
- Simplify Audio::calculateSampleOffset.
- Made Audio::calculateSampleOffset accessable from outside audiostream.cpp.
- Adapt KYRA's AUDStream to use Audio::calculateSampleOffset.
svn-id: r47082
Diffstat (limited to 'engines/kyra')
-rw-r--r-- | engines/kyra/sound_digital.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/engines/kyra/sound_digital.cpp b/engines/kyra/sound_digital.cpp index 8c23f05626..a6d89ba7ee 100644 --- a/engines/kyra/sound_digital.cpp +++ b/engines/kyra/sound_digital.cpp @@ -121,7 +121,7 @@ public: int getRate() const { return _rate; } - bool seek(const Audio::Timestamp &); + bool seek(const Audio::Timestamp &where); Audio::Timestamp getLength() const { return _length; } private: Common::SeekableReadStream *_stream; @@ -356,8 +356,7 @@ int AUDStream::readChunk(int16 *buffer, const int maxSamples) { } bool AUDStream::seek(const Audio::Timestamp &where) { - // TODO: A more exact implementation would be nice - const uint32 seekSample = where.msecs() * getRate() / 1000; + const uint32 seekSample = Audio::calculateSampleOffset(where, getRate()); _stream->seek(_streamStart); _processedSize = 0; |