diff options
| author | Max Horn | 2003-12-19 01:30:19 +0000 |
|---|---|---|
| committer | Max Horn | 2003-12-19 01:30:19 +0000 |
| commit | d8903123b0bd4265de03f40eaaf6bb1d2b160c3f (patch) | |
| tree | d1f0841228acacd932f41dbdd3b249a6fc5e97af /sound/mixer.cpp | |
| parent | 0cddca5f43c5b85d28f2977d783a6cd5cec0d540 (diff) | |
| download | scummvm-rg350-d8903123b0bd4265de03f40eaaf6bb1d2b160c3f.tar.gz scummvm-rg350-d8903123b0bd4265de03f40eaaf6bb1d2b160c3f.tar.bz2 scummvm-rg350-d8903123b0bd4265de03f40eaaf6bb1d2b160c3f.zip | |
distinguish between end of stream and end of data
svn-id: r11756
Diffstat (limited to 'sound/mixer.cpp')
| -rw-r--r-- | sound/mixer.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/mixer.cpp b/sound/mixer.cpp index 5278071c1e..786c376099 100644 --- a/sound/mixer.cpp +++ b/sound/mixer.cpp @@ -485,9 +485,11 @@ void Channel::destroy() { */ void Channel::mix(int16 *data, uint len) { assert(_input); - if (_input->eos()) { - // TODO: call drain method + + if (_input->endOfStream()) { destroy(); + } else if (_input->endOfData()) { + // TODO: call drain method } else { assert(_converter); |