[Scummvm-cvs-logs] scummvm master -> 2e58e6d09f7350c60d5e35e30dd418ef62c7fa4b

[bluegr]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
5ffafbb9b8 Revert "SCI32: Properly initialize AudioChannel inside Audio32::play()"
2e58e6d09f SCI32: Properly initialize pausedAtTick inside Audio32::play()


Commit: 5ffafbb9b86b0a9d2303392333a9f6c77f2e30f9
    https://github.com/scummvm/scummvm/commit/5ffafbb9b86b0a9d2303392333a9f6c77f2e30f9
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2016-06-25T17:37:43+03:00

Commit Message:
Revert "SCI32: Properly initialize AudioChannel inside Audio32::play()"

This reverts commit 5eaea05a2b6af0ddcf28fca1f0cd3fc0c54f4d07.

Changed paths:
    engines/sci/sound/audio32.cpp



diff --git a/engines/sci/sound/audio32.cpp b/engines/sci/sound/audio32.cpp
index c457311..def3e4d 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


Commit: 2e58e6d09f7350c60d5e35e30dd418ef62c7fa4b
    https://github.com/scummvm/scummvm/commit/2e58e6d09f7350c60d5e35e30dd418ef62c7fa4b
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2016-06-25T17:42:19+03:00

Commit Message:
SCI32: Properly initialize pausedAtTick inside Audio32::play()

Fixes audio not playing in later SCI32 games that use Audio32

Changed paths:
    engines/sci/sound/audio32.cpp



diff --git a/engines/sci/sound/audio32.cpp b/engines/sci/sound/audio32.cpp
index def3e4d..7958a6f 100644
--- a/engines/sci/sound/audio32.cpp
+++ b/engines/sci/sound/audio32.cpp
@@ -561,11 +561,14 @@ 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.robot = false;
-	channel.vmd = false;
 	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.soundNode = soundNode;
 	channel.volume = volume < 0 || volume > kMaxVolume ? (int)kMaxVolume : volume;
 	// TODO: SCI3 introduces stereo audio