diff options
| author | Eugene Sandulenko | 2014-08-09 15:33:50 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2014-08-09 15:33:50 +0200 |
| commit | 6e794a9823440b6859ce65fb1097d710780a493d (patch) | |
| tree | 9a8d90a53d7592cb11786521bee8ff8158e13aeb /audio/audiostream.h | |
| parent | 908b4113c11686de5e8bcc3014917c92ff8961b6 (diff) | |
| parent | dc155b23f02f6a462bf59a3f51dcdfea3e95c5b8 (diff) | |
| download | scummvm-rg350-6e794a9823440b6859ce65fb1097d710780a493d.tar.gz scummvm-rg350-6e794a9823440b6859ce65fb1097d710780a493d.tar.bz2 scummvm-rg350-6e794a9823440b6859ce65fb1097d710780a493d.zip | |
Merge pull request #487 from clone2727/audio_fixes
AUDIO: Miscellaneous AudioStream fixes
Diffstat (limited to 'audio/audiostream.h')
| -rw-r--r-- | audio/audiostream.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/audio/audiostream.h b/audio/audiostream.h index d5d7d0b6c7..5202a4711c 100644 --- a/audio/audiostream.h +++ b/audio/audiostream.h @@ -118,6 +118,7 @@ public: int readBuffer(int16 *buffer, const int numSamples); bool endOfData() const; + bool endOfStream() const; bool isStereo() const { return _parent->isStereo(); } int getRate() const { return _parent->getRate(); } @@ -247,7 +248,8 @@ public: DisposeAfterUse::Flag disposeAfterUse = DisposeAfterUse::YES); int readBuffer(int16 *buffer, const int numSamples); - bool endOfData() const { return _done; } + bool endOfData() const; + bool endOfStream() const; bool isStereo() const { return _parent->isStereo(); } int getRate() const { return _parent->getRate(); } @@ -287,7 +289,8 @@ public: int getRate() const { return _parent->getRate(); } - bool endOfData() const { return (_pos >= _length) || _parent->endOfStream(); } + bool endOfData() const { return (_pos >= _length) || _parent->endOfData(); } + bool endOfStream() const { return (_pos >= _length) || _parent->endOfStream(); } bool seek(const Timestamp &where); |