libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-03 09:23:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanup.

Browse Source 
svn-id: r47139
This commit is contained in:
Johannes Schickel 2010-01-07 20:13:02 +00:00
parent bd651c6c3d
commit a15cc002bb
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sound/audiostream.cpp
View File

@ -149,8 +149,10 @@ AudioStream *makeLoopingAudioStream(RewindableAudioStream *stream, uint loops) {
#pragma mark -
SubSeekableAudioStream::SubSeekableAudioStream(SeekableAudioStream *parent, const Timestamp start, const Timestamp end, bool disposeAfterUse)
: _parent(parent), _disposeAfterUse(disposeAfterUse), _isStereo(parent->isStereo()),
_start(start.convertToFramerate(getRate())), _pos(0, getRate()), _length(end.convertToFramerate(getRate())) {
: _parent(parent), _disposeAfterUse(disposeAfterUse),
_start(start.convertToFramerate(getRate())),
_pos(0, getRate() * (isStereo() ? 2 : 1)),
_length(end.convertToFramerate(getRate())) {
// TODO: This really looks like Timestamp::operator-
_length = Timestamp(_length.secs() - _start.secs(), _length.numberOfFrames() - _start.numberOfFrames(), getRate());
_parent->seek(_start);
@ -162,14 +164,19 @@ SubSeekableAudioStream::~SubSeekableAudioStream() {
}
int SubSeekableAudioStream::readBuffer(int16 *buffer, const int numSamples) {
int framesLeft = MIN(_length.frameDiff(_pos) * (_isStereo ? 2 : 1), numSamples);
int framesLeft = MIN(_length.frameDiff(_pos), numSamples);
int framesRead = _parent->readBuffer(buffer, framesLeft);
_pos = _pos.addFrames(framesRead / (_isStereo ? 2 : 1));
_pos = _pos.addFrames(framesRead);
return framesRead;
}
bool SubSeekableAudioStream::seek(const Timestamp &where) {
_pos = where.convertToFramerate(getRate());
if (_pos > _length) {
_pos = _length;
return false;
}
// TODO: This really looks like Timestamp::operator+
if (_parent->seek(Timestamp(_pos.secs() + _start.secs(), _pos.numberOfFrames() + _start.numberOfFrames(), getRate()))) {
return true;

3
sound/audiostream.h
View File

@ -223,7 +223,7 @@ public:
int readBuffer(int16 *buffer, const int numSamples);
bool isStereo() const { return _isStereo; }
bool isStereo() const { return _parent->isStereo(); }
int getRate() const { return _parent->getRate(); }
@ -235,7 +235,6 @@ public:
private:
SeekableAudioStream *_parent;
bool _disposeAfterUse;
const bool _isStereo;
const Timestamp _start;
Timestamp _pos, _length;