libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-22 18:37:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCI32: Fix hang when playing auto-play audio channels

Browse Source
This commit is contained in:
Colin Snover 2016-06-24 14:47:15 -05:00
parent 6ec206ccee
commit c5914eb80d
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
engines/sci/sound/audio32.cpp
View File

@ -596,14 +596,11 @@ uint16 Audio32::play(int16 channelIndex, const ResourceId resourceId, const bool
AudioChannel &channel = getChannel(channelIndex);
channel.id = resourceId;
channel.resource = resource;
// resourceStream, stream, converter, duration and startedAtTick will be initialized below
channel.pausedAtTick = 0;
channel.loop = loop;
channel.lastFadeTick = 0;
channel.fadeStepsRemaining = 0;
// fadeVolume, fadeSpeed and stopChannelOnFade will be initialized once they are actually used
channel.robot = false;
channel.vmd = false;
channel.lastFadeTick = 0;
channel.fadeStepsRemaining = 0;
channel.soundNode = soundNode;
channel.volume = volume < 0 || volume > kMaxVolume ? (int)kMaxVolume : volume;
// TODO: SCI3 introduces stereo audio
@ -648,9 +645,7 @@ uint16 Audio32::play(int16 channelIndex, const ResourceId resourceId, const bool
channel.duration = /* round up */ 1 + (channel.stream->getLength().msecs() * 60 / 1000);
const uint32 now = g_sci->getTickCount();
if (!autoPlay) {
channel.pausedAtTick = now;
}
channel.pausedAtTick = autoPlay ? 0 : now;
channel.startedAtTick = now;
if (_numActiveChannels == 1) {