diff options
| author | Filippos Karapetis | 2016-06-25 17:24:05 +0300 |
|---|---|---|
| committer | Filippos Karapetis | 2016-06-25 17:37:43 +0300 |
| commit | 5ffafbb9b86b0a9d2303392333a9f6c77f2e30f9 (patch) | |
| tree | ac8c03f8ade5348c876738296324cf8ec7663d58 /engines/sci | |
| parent | d94f40e3ce009a5d37d4e86cb8ffe89acd3138c2 (diff) | |
| download | scummvm-rg350-5ffafbb9b86b0a9d2303392333a9f6c77f2e30f9.tar.gz scummvm-rg350-5ffafbb9b86b0a9d2303392333a9f6c77f2e30f9.tar.bz2 scummvm-rg350-5ffafbb9b86b0a9d2303392333a9f6c77f2e30f9.zip | |
Revert "SCI32: Properly initialize AudioChannel inside Audio32::play()"
This reverts commit 5eaea05a2b6af0ddcf28fca1f0cd3fc0c54f4d07.
Diffstat (limited to 'engines/sci')
| -rw-r--r-- | engines/sci/sound/audio32.cpp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/engines/sci/sound/audio32.cpp b/engines/sci/sound/audio32.cpp index c457311d66..def3e4d838 100644 --- a/engines/sci/sound/audio32.cpp +++ b/engines/sci/sound/audio32.cpp @@ -561,20 +561,11 @@ uint16 Audio32::play(int16 channelIndex, const ResourceId resourceId, const bool AudioChannel &channel = getChannel(channelIndex); channel.id = resourceId; channel.resource = resource; - channel.resourceStream = nullptr; - channel.stream = nullptr; - channel.converter = nullptr; - channel.duration = 0; - channel.startedAtTick = 0; - channel.pausedAtTick = 0; channel.loop = loop; - channel.lastFadeTick = 0; - channel.fadeVolume = 0; - channel.fadeSpeed = 0; - channel.fadeStepsRemaining = 0; - channel.stopChannelOnFade = false; 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 |