diff options
| author | Max Horn | 2003-12-19 00:09:34 +0000 |
|---|---|---|
| committer | Max Horn | 2003-12-19 00:09:34 +0000 |
| commit | 32dd4cc0061de24c804bd7a9be9dfc6576dd19a1 (patch) | |
| tree | bf9c7e6de4ba027af96bc629589578b353eb87ec /sound | |
| parent | e58514f87dc6e7c9ce1d5868a8f5ac752c1936a7 (diff) | |
| download | scummvm-rg350-32dd4cc0061de24c804bd7a9be9dfc6576dd19a1.tar.gz scummvm-rg350-32dd4cc0061de24c804bd7a9be9dfc6576dd19a1.tar.bz2 scummvm-rg350-32dd4cc0061de24c804bd7a9be9dfc6576dd19a1.zip | |
fix for recent audio stream regression
svn-id: r11752
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/audiostream.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/audiostream.cpp b/sound/audiostream.cpp index a0dfcbbfcb..3fcdb64051 100644 --- a/sound/audiostream.cpp +++ b/sound/audiostream.cpp @@ -132,7 +132,7 @@ public: int16 read(); bool isStereo() const { return stereo; } - bool eos() const { return _finalized; } + bool eos() const { return _finalized && eosIntern(); } int getRate() const { return _rate; } @@ -143,7 +143,7 @@ public: template<bool stereo, bool is16Bit, bool isUnsigned> WrappedMemoryStream<stereo, is16Bit, isUnsigned>::WrappedMemoryStream(int rate, uint bufferSize) - : _rate(rate) { + : _finalized(false), _rate(rate) { // Verify the buffer size is sane if (is16Bit && stereo) @@ -154,8 +154,6 @@ WrappedMemoryStream<stereo, is16Bit, isUnsigned>::WrappedMemoryStream(int rate, _bufferStart = (byte *)malloc(bufferSize); _pos = _end = _bufferStart; _bufferEnd = _bufferStart + bufferSize; - - _finalized = false; } template<bool stereo, bool is16Bit, bool isUnsigned> |