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

Strangerke Strangerke at scummvm.org
Sat Aug 10 22:38:51 CEST 2013


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:
e209e15833 MORTEVIELLE: Fix check of end of stream


Commit: e209e1583321f756a93ca253f1aca1c10f996ab9
    https://github.com/scummvm/scummvm/commit/e209e1583321f756a93ca253f1aca1c10f996ab9
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-08-10T13:37:26-07:00

Commit Message:
MORTEVIELLE: Fix check of end of stream

Changed paths:
    engines/mortevielle/speech.cpp



diff --git a/engines/mortevielle/speech.cpp b/engines/mortevielle/speech.cpp
index 0966930..4940c93 100644
--- a/engines/mortevielle/speech.cpp
+++ b/engines/mortevielle/speech.cpp
@@ -555,10 +555,10 @@ void SpeechManager::startSpeech(int rep, int ht, int typ) {
 
 	if (typ != 0) {
 		Audio::SoundHandle soundHandle;
+		_vm->_soundManager._audioStream->finish();
 		_vm->_soundManager._mixer->playStream(Audio::Mixer::kSFXSoundType, &soundHandle, _vm->_soundManager._audioStream);
 		while (_vm->_soundManager._mixer->isSoundHandleActive(soundHandle) && !_vm->keyPressed() && !_vm->_mouseClick && !_vm->shouldQuit())
 			;
-		_vm->_soundManager._audioStream->finish();
 		_vm->_soundManager._mixer->stopHandle(soundHandle);
 		_vm->_soundManager._audioStream = nullptr;
 	}






More information about the Scummvm-git-logs mailing list