aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/smush
diff options
context:
space:
mode:
authorMax Horn2010-01-08 22:10:19 +0000
committerMax Horn2010-01-08 22:10:19 +0000
commitc4892593538887d36858cbba609dbe34a4b60792 (patch)
treee4706acc9612b33677a1ab6ef03e3769ad12f347 /engines/scumm/smush
parentf720d99b0a4fdc97d4d5c01b8c4db43c318c62b1 (diff)
downloadscummvm-rg350-c4892593538887d36858cbba609dbe34a4b60792.tar.gz
scummvm-rg350-c4892593538887d36858cbba609dbe34a4b60792.tar.bz2
scummvm-rg350-c4892593538887d36858cbba609dbe34a4b60792.zip
Switch SCUMM from AppendableAudioStream to QueuingAudioStream
svn-id: r47183
Diffstat (limited to 'engines/scumm/smush')
-rw-r--r--engines/scumm/smush/smush_mixer.cpp4
-rw-r--r--engines/scumm/smush/smush_mixer.h2
-rw-r--r--engines/scumm/smush/smush_player.cpp4
-rw-r--r--engines/scumm/smush/smush_player.h2
4 files changed, 6 insertions, 6 deletions
diff --git a/engines/scumm/smush/smush_mixer.cpp b/engines/scumm/smush/smush_mixer.cpp
index 0a0cda5b76..c069f6fe1b 100644
--- a/engines/scumm/smush/smush_mixer.cpp
+++ b/engines/scumm/smush/smush_mixer.cpp
@@ -122,12 +122,12 @@ bool SmushMixer::handleFrame() {
if (_mixer->isReady()) {
// Stream the data
if (!_channels[i].stream) {
- _channels[i].stream = Audio::makeAppendableAudioStream(_channels[i].chan->getRate(), flags);
+ _channels[i].stream = Audio::makeQueuingAudioStream(_channels[i].chan->getRate(), stereo);
_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_channels[i].handle, _channels[i].stream);
}
_mixer->setChannelVolume(_channels[i].handle, vol);
_mixer->setChannelBalance(_channels[i].handle, pan);
- _channels[i].stream->queueBuffer(data, size); // The stream will free the buffer for us
+ _channels[i].stream->queueBuffer(data, size, flags); // The stream will free the buffer for us
} else
delete[] data;
}
diff --git a/engines/scumm/smush/smush_mixer.h b/engines/scumm/smush/smush_mixer.h
index 0bf6de2762..c7a7354511 100644
--- a/engines/scumm/smush/smush_mixer.h
+++ b/engines/scumm/smush/smush_mixer.h
@@ -44,7 +44,7 @@ private:
int id;
SmushChannel *chan;
Audio::SoundHandle handle;
- Audio::AppendableAudioStream *stream;
+ Audio::QueuingAudioStream *stream;
} _channels[NUM_CHANNELS];
int _soundFrequency;
diff --git a/engines/scumm/smush/smush_player.cpp b/engines/scumm/smush/smush_player.cpp
index 225d7573bf..df7b97a9af 100644
--- a/engines/scumm/smush/smush_player.cpp
+++ b/engines/scumm/smush/smush_player.cpp
@@ -469,10 +469,10 @@ void SmushPlayer::handleIACT(int32 subSize, Common::SeekableReadStream &b) {
} while (--count);
if (!_IACTstream) {
- _IACTstream = Audio::makeAppendableAudioStream(22050, Audio::Mixer::FLAG_STEREO | Audio::Mixer::FLAG_16BITS);
+ _IACTstream = Audio::makeQueuingAudioStream(22050, true);
_vm->_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_IACTchannel, _IACTstream);
}
- _IACTstream->queueBuffer(output_data, 0x1000);
+ _IACTstream->queueBuffer(output_data, 0x1000, Audio::Mixer::FLAG_STEREO | Audio::Mixer::FLAG_16BITS);
bsize -= len;
d_src += len;
diff --git a/engines/scumm/smush/smush_player.h b/engines/scumm/smush/smush_player.h
index f64f56ad4e..af7942c193 100644
--- a/engines/scumm/smush/smush_player.h
+++ b/engines/scumm/smush/smush_player.h
@@ -65,7 +65,7 @@ private:
uint32 _frame;
Audio::SoundHandle _IACTchannel;
- Audio::AppendableAudioStream *_IACTstream;
+ Audio::QueuingAudioStream *_IACTstream;
Audio::SoundHandle _compressedFileSoundHandle;
bool _compressedFileMode;