diff options
author | Max Horn | 2008-01-05 22:57:36 +0000 |
---|---|---|
committer | Max Horn | 2008-01-05 22:57:36 +0000 |
commit | 56ad5f493e5ead7915b687d1d25e73adee5ffbff (patch) | |
tree | 2ce8f4a3720e83a74dfb74355673f22b0cf5a6e6 /engines/scumm/imuse_digi/dimuse_track.cpp | |
parent | 7ebdffb0cd1bb7f8bcaa2359d8a94c7a109b5104 (diff) | |
download | scummvm-rg350-56ad5f493e5ead7915b687d1d25e73adee5ffbff.tar.gz scummvm-rg350-56ad5f493e5ead7915b687d1d25e73adee5ffbff.tar.bz2 scummvm-rg350-56ad5f493e5ead7915b687d1d25e73adee5ffbff.zip |
Play SOU data instantly, not slightly delayed -> allows us to get rid of Track::streamSou & Track::mixerStreamRunning (have not yet removed the latter to avoid introducing a new savegame version)
svn-id: r30268
Diffstat (limited to 'engines/scumm/imuse_digi/dimuse_track.cpp')
-rw-r--r-- | engines/scumm/imuse_digi/dimuse_track.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/engines/scumm/imuse_digi/dimuse_track.cpp b/engines/scumm/imuse_digi/dimuse_track.cpp index 96841672a7..c428bb735f 100644 --- a/engines/scumm/imuse_digi/dimuse_track.cpp +++ b/engines/scumm/imuse_digi/dimuse_track.cpp @@ -110,8 +110,7 @@ void IMuseDigital::startSound(int soundId, const char *soundName, int soundType, track->souStreamUsed = (input != 0); if (track->souStreamUsed) { - track->streamSou = input; - track->mixerStreamRunning = false; + _mixer->playInputStream(track->getType(), &track->mixChanHandle, input, -1, track->getVol(), track->getPan()); } else { strcpy(track->soundName, soundName); track->soundDesc = _sound->openSound(soundId, soundName, soundType, volGroupId, -1); @@ -157,7 +156,6 @@ void IMuseDigital::startSound(int soundId, const char *soundName, int soundType, track->stream = Audio::makeAppendableAudioStream(freq, makeMixerFlags(track->mixerFlags)); _mixer->playInputStream(track->getType(), &track->mixChanHandle, track->stream, -1, track->getVol(), track->getPan(), false); - track->mixerStreamRunning = true; } track->used = true; @@ -319,7 +317,6 @@ IMuseDigital::Track *IMuseDigital::cloneToFadeOutTrack(Track *track, int fadeDel // Create an appendable output buffer fadeTrack->stream = Audio::makeAppendableAudioStream(_sound->getFreq(fadeTrack->soundDesc), makeMixerFlags(fadeTrack->mixerFlags)); _mixer->playInputStream(track->getType(), &fadeTrack->mixChanHandle, fadeTrack->stream, -1, fadeTrack->getVol(), fadeTrack->getPan(), false); - fadeTrack->mixerStreamRunning = true; fadeTrack->used = true; return fadeTrack; |