diff options
| author | Max Horn | 2010-01-09 00:19:13 +0000 |
|---|---|---|
| committer | Max Horn | 2010-01-09 00:19:13 +0000 |
| commit | be8371fb07936f27934909c4c0eb5184547a2656 (patch) | |
| tree | 9edc668e3306f3ae87a8b9ed3a4a26a05eea0bdc /engines/kyra/vqa.cpp | |
| parent | 41eaeaa61d968442bf2055d07e30b0dd4d31d606 (diff) | |
| download | scummvm-rg350-be8371fb07936f27934909c4c0eb5184547a2656.tar.gz scummvm-rg350-be8371fb07936f27934909c4c0eb5184547a2656.tar.bz2 scummvm-rg350-be8371fb07936f27934909c4c0eb5184547a2656.zip | |
Replace AppendableAudioStream by QueuingAudioStream
svn-id: r47189
Diffstat (limited to 'engines/kyra/vqa.cpp')
| -rw-r--r-- | engines/kyra/vqa.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/kyra/vqa.cpp b/engines/kyra/vqa.cpp index 1b9683ed65..fde6e06a96 100644 --- a/engines/kyra/vqa.cpp +++ b/engines/kyra/vqa.cpp @@ -292,7 +292,7 @@ bool VQAMovie::open(const char *filename) { assert(_header.bits == 8); assert(_header.channels == 1); - _stream = Audio::makeAppendableAudioStream(_header.freq, Audio::Mixer::FLAG_UNSIGNED); + _stream = Audio::makeQueuingAudioStream(_header.freq, false); } else { _stream = NULL; } @@ -422,7 +422,7 @@ void VQAMovie::displayFrame(uint frameNum) { inbuf = new byte[size]; _file->read(inbuf, size); assert(_stream); - _stream->queueBuffer(inbuf, size); + _stream->queueBuffer(inbuf, size, Audio::Mixer::FLAG_UNSIGNED); break; case MKID_BE('SND1'): // Compressed sound, almost like AUD @@ -435,12 +435,12 @@ void VQAMovie::displayFrame(uint frameNum) { if (insize == outsize) { assert(_stream); - _stream->queueBuffer(inbuf, insize); + _stream->queueBuffer(inbuf, insize, Audio::Mixer::FLAG_UNSIGNED); } else { outbuf = new byte[outsize]; decodeSND1(inbuf, insize, outbuf, outsize); assert(_stream); - _stream->queueBuffer(outbuf, outsize); + _stream->queueBuffer(outbuf, outsize, Audio::Mixer::FLAG_UNSIGNED); delete[] inbuf; } break; @@ -612,7 +612,7 @@ void VQAMovie::play() { case MKID_BE('SND0'): // Uncompressed sound inbuf = new byte[size]; _file->read(inbuf, size); - _stream->queueBuffer(inbuf, size); + _stream->queueBuffer(inbuf, size, Audio::Mixer::FLAG_UNSIGNED); break; case MKID_BE('SND1'): // Compressed sound @@ -623,11 +623,11 @@ void VQAMovie::play() { _file->read(inbuf, insize); if (insize == outsize) { - _stream->queueBuffer(inbuf, insize); + _stream->queueBuffer(inbuf, insize, Audio::Mixer::FLAG_UNSIGNED); } else { outbuf = new byte[outsize]; decodeSND1(inbuf, insize, outbuf, outsize); - _stream->queueBuffer(outbuf, outsize); + _stream->queueBuffer(outbuf, outsize, Audio::Mixer::FLAG_UNSIGNED); delete[] inbuf; } break; |