[Scummvm-git-logs] scummvm master -> 7a1d359342579d0d48c59d120ec734d215cd73c8

[dreammaster]

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

Summary:
7a1d359342 TITANIC: Fix music playback in music room


Commit: 7a1d359342579d0d48c59d120ec734d215cd73c8
    https://github.com/scummvm/scummvm/commit/7a1d359342579d0d48c59d120ec734d215cd73c8
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-09-16T17:57:37-04:00

Commit Message:
TITANIC: Fix music playback in music room

Changed paths:
    engines/titanic/sound/music_room_handler.cpp


diff --git a/engines/titanic/sound/music_room_handler.cpp b/engines/titanic/sound/music_room_handler.cpp
index ffc90ff..5c1cd60 100644
--- a/engines/titanic/sound/music_room_handler.cpp
+++ b/engines/titanic/sound/music_room_handler.cpp
@@ -218,9 +218,9 @@ void CMusicRoomHandler::updateAudio() {
 			// Iterate through each of the four instruments and do an additive
 			// read that will merge their data onto the output buffer
 			for (count = size, ptr = audioData; count > 0; ) {
-				int amount = musicWave->read(ptr, count);
+				int amount = musicWave->read(ptr, count * 2);
 				if (amount > 0) {
-					count -= amount;
+					count -= amount / sizeof(uint16);
 					ptr += amount / sizeof(uint16);
 				} else if (!pollInstrument(instrument)) {
 					--_instrumentsActive;