[Scummvm-git-logs] scummvm master -> e0aa906804942c04db6b3febed159846b7bcfb51

[csnover]

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:
dbf2f0c266 AUDIO: Fix compilation on AmigaOS 4
e0aa906804 SCI32: Fix bad audio looping


Commit: dbf2f0c266b4e5e0ed39b7d2dd856960f62caae8
    https://github.com/scummvm/scummvm/commit/dbf2f0c266b4e5e0ed39b7d2dd856960f62caae8
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-09-10T02:08:21-05:00

Commit Message:
AUDIO: Fix compilation on AmigaOS 4

Changed paths:
    audio/decoders/adpcm.cpp


diff --git a/audio/decoders/adpcm.cpp b/audio/decoders/adpcm.cpp
index 7f578dd..e87661d 100644
--- a/audio/decoders/adpcm.cpp
+++ b/audio/decoders/adpcm.cpp
@@ -352,9 +352,9 @@ do { \
 int DK3_ADPCMStream::readBuffer(int16 *buffer, const int numSamples) {
 	assert((numSamples % 4) == 0);
 
-	const uint startOffset = _stream->pos() % _blockAlign;
-	uint audioBytesLeft = _endpos - _stream->pos();
-	uint blockBytesLeft;
+	const uint32 startOffset = _stream->pos() % _blockAlign;
+	uint32 audioBytesLeft = _endpos - _stream->pos();
+	uint32 blockBytesLeft;
 	if (startOffset != 0) {
 		blockBytesLeft = _blockAlign - startOffset;
 	} else {


Commit: e0aa906804942c04db6b3febed159846b7bcfb51
    https://github.com/scummvm/scummvm/commit/e0aa906804942c04db6b3febed159846b7bcfb51
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-09-10T02:08:22-05:00

Commit Message:
SCI32: Fix bad audio looping

Fixes Trac#10182.

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


diff --git a/engines/sci/sound/audio32.cpp b/engines/sci/sound/audio32.cpp
index ad9af4e..1b521cd 100644
--- a/engines/sci/sound/audio32.cpp
+++ b/engines/sci/sound/audio32.cpp
@@ -63,6 +63,7 @@ public:
 			samplesRead = _stream->readBuffer(buffer, numSamples);
 			totalSamplesRead += samplesRead;
 			numSamples -= samplesRead;
+			buffer += samplesRead;
 		} while (samplesRead > 0 && _loop && numSamples > 0);
 		return totalSamplesRead;
 	}