diff options
author | Max Horn | 2010-01-08 22:10:19 +0000 |
---|---|---|
committer | Max Horn | 2010-01-08 22:10:19 +0000 |
commit | c4892593538887d36858cbba609dbe34a4b60792 (patch) | |
tree | e4706acc9612b33677a1ab6ef03e3769ad12f347 /engines/scumm/imuse_digi | |
parent | f720d99b0a4fdc97d4d5c01b8c4db43c318c62b1 (diff) | |
download | scummvm-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/imuse_digi')
-rw-r--r-- | engines/scumm/imuse_digi/dimuse.cpp | 4 | ||||
-rw-r--r-- | engines/scumm/imuse_digi/dimuse_track.cpp | 4 | ||||
-rw-r--r-- | engines/scumm/imuse_digi/dimuse_track.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/engines/scumm/imuse_digi/dimuse.cpp b/engines/scumm/imuse_digi/dimuse.cpp index 43e0148b00..7672587904 100644 --- a/engines/scumm/imuse_digi/dimuse.cpp +++ b/engines/scumm/imuse_digi/dimuse.cpp @@ -202,7 +202,7 @@ void IMuseDigital::saveOrLoad(Serializer *ser) { track->mixerFlags |= kFlagLittleEndian; #endif - track->stream = Audio::makeAppendableAudioStream(freq, makeMixerFlags(track->mixerFlags)); + track->stream = Audio::makeQueuingAudioStream(freq, track->mixerFlags & kFlagStereo); _mixer->playInputStream(track->getType(), &track->mixChanHandle, track->stream, -1, track->getVol(), track->getPan()); _mixer->pauseHandle(track->mixChanHandle, true); @@ -344,7 +344,7 @@ void IMuseDigital::callback() { curFeedSize = feedSize; if (_mixer->isReady()) { - track->stream->queueBuffer(tmpSndBufferPtr, curFeedSize); + track->stream->queueBuffer(tmpSndBufferPtr, curFeedSize, makeMixerFlags(track->mixerFlags)); track->regionOffset += curFeedSize; } else delete[] tmpSndBufferPtr; diff --git a/engines/scumm/imuse_digi/dimuse_track.cpp b/engines/scumm/imuse_digi/dimuse_track.cpp index a389c0e7e7..58ae48d330 100644 --- a/engines/scumm/imuse_digi/dimuse_track.cpp +++ b/engines/scumm/imuse_digi/dimuse_track.cpp @@ -172,7 +172,7 @@ void IMuseDigital::startSound(int soundId, const char *soundName, int soundType, track->dataMod12Bit = otherTrack->dataMod12Bit; } - track->stream = Audio::makeAppendableAudioStream(freq, makeMixerFlags(track->mixerFlags)); + track->stream = Audio::makeQueuingAudioStream(freq, track->mixerFlags & kFlagStereo); _mixer->playInputStream(track->getType(), &track->mixChanHandle, track->stream, -1, track->getVol(), track->getPan()); } @@ -372,7 +372,7 @@ Track *IMuseDigital::cloneToFadeOutTrack(Track *track, int fadeDelay) { fadeTrack->volFadeUsed = true; // Create an appendable output buffer - fadeTrack->stream = Audio::makeAppendableAudioStream(_sound->getFreq(fadeTrack->soundDesc), makeMixerFlags(fadeTrack->mixerFlags)); + fadeTrack->stream = Audio::makeQueuingAudioStream(_sound->getFreq(fadeTrack->soundDesc), track->mixerFlags & kFlagStereo); _mixer->playInputStream(track->getType(), &fadeTrack->mixChanHandle, fadeTrack->stream, -1, fadeTrack->getVol(), fadeTrack->getPan()); fadeTrack->used = true; diff --git a/engines/scumm/imuse_digi/dimuse_track.h b/engines/scumm/imuse_digi/dimuse_track.h index c2ed64a556..e3daf37b8b 100644 --- a/engines/scumm/imuse_digi/dimuse_track.h +++ b/engines/scumm/imuse_digi/dimuse_track.h @@ -76,7 +76,7 @@ struct Track { ImuseDigiSndMgr::SoundDesc *soundDesc; // sound handle used by iMuse sound manager Audio::SoundHandle mixChanHandle; // sound mixer's channel handle - Audio::AppendableAudioStream *stream; // sound mixer's audio stream handle for *.la1 and *.bun + Audio::QueuingAudioStream *stream; // sound mixer's audio stream handle for *.la1 and *.bun Track() : soundId(-1), used(false), stream(NULL) { } |