[Scummvm-cvs-logs] scummvm master -> cf92118507f907e03f36b8dcd64a24e161a51712

[Kirben]

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:
cf92118507 AGOS: Fix turning music on and off in Amiga versions.


Commit: cf92118507f907e03f36b8dcd64a24e161a51712
    https://github.com/scummvm/scummvm/commit/cf92118507f907e03f36b8dcd64a24e161a51712
Author: Kirben (kirben at optusnet.com.au)
Date: 2015-07-05T11:41:10+10:00

Commit Message:
AGOS: Fix turning music on and off in Amiga versions.

Changed paths:
    engines/agos/input.cpp
    engines/agos/res_snd.cpp



diff --git a/engines/agos/input.cpp b/engines/agos/input.cpp
index 687a8ef..686b1c3 100644
--- a/engines/agos/input.cpp
+++ b/engines/agos/input.cpp
@@ -707,6 +707,7 @@ bool AGOSEngine::processSpecialKeys() {
 		if (_midiEnabled) {
 			_midi->pause(_musicPaused);
 		}
+		_mixer->pauseHandle(_modHandle, _musicPaused);
 		syncSoundSettings();
 		break;
 	case 's':
diff --git a/engines/agos/res_snd.cpp b/engines/agos/res_snd.cpp
index c02cf96..d04f173 100644
--- a/engines/agos/res_snd.cpp
+++ b/engines/agos/res_snd.cpp
@@ -220,6 +220,7 @@ void AGOSEngine::playModule(uint16 music) {
 	}
 
 	_mixer->playStream(Audio::Mixer::kMusicSoundType, &_modHandle, audioStream);
+	_mixer->pauseHandle(_modHandle, _musicPaused);
 }
 
 void AGOSEngine_Simon1::playMusic(uint16 music, uint16 track) {