diff options
Diffstat (limited to 'engines/kyra')
| -rw-r--r-- | engines/kyra/vqa.cpp | 14 | ||||
| -rw-r--r-- | engines/kyra/vqa.h | 4 | ||||
| -rw-r--r-- | engines/kyra/wsamovie.h | 6 |
3 files changed, 10 insertions, 14 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; diff --git a/engines/kyra/vqa.h b/engines/kyra/vqa.h index bf3d1fe855..c1448a4865 100644 --- a/engines/kyra/vqa.h +++ b/engines/kyra/vqa.h @@ -33,7 +33,7 @@ class OSystem; namespace Audio { -class AppendableAudioStream; +class QueuingAudioStream; } // End of namespace Audio namespace Common { @@ -127,7 +127,7 @@ protected: byte *_frame; - Audio::AppendableAudioStream *_stream; + Audio::QueuingAudioStream *_stream; Audio::SoundHandle _sound; uint32 readTag(); diff --git a/engines/kyra/wsamovie.h b/engines/kyra/wsamovie.h index c93221d7a0..d2c041742a 100644 --- a/engines/kyra/wsamovie.h +++ b/engines/kyra/wsamovie.h @@ -26,12 +26,8 @@ #ifndef KYRA_WSAMOVIE_H #define KYRA_WSAMOVIE_H -namespace Audio { -class AppendableAudioStream; -class SoundHandle; -} // End of namespace Audio - namespace Kyra { + class KyraEngine_v1; class Screen_v2; class Palette; |