[Scummvm-cvs-logs] scummvm master -> 4ad53dced0e6031f9f634e50dd7bae96b8d7f0f1

dreammaster dreammaster at scummvm.org
Tue Aug 11 04:26:42 CEST 2015


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:
4ad53dced0 SHERLOCK: RT: First speech is now playing correctly


Commit: 4ad53dced0e6031f9f634e50dd7bae96b8d7f0f1
    https://github.com/scummvm/scummvm/commit/4ad53dced0e6031f9f634e50dd7bae96b8d7f0f1
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-08-10T22:25:48-04:00

Commit Message:
SHERLOCK: RT: First speech is now playing correctly

Changed paths:
    engines/sherlock/sound.cpp



diff --git a/engines/sherlock/sound.cpp b/engines/sherlock/sound.cpp
index ffc626c..d4907e0 100644
--- a/engines/sherlock/sound.cpp
+++ b/engines/sherlock/sound.cpp
@@ -272,7 +272,7 @@ void Sound::playSpeech(const Common::String &name) {
 
 	// TODO: Doesn't seem to be WAV files. Need to find out what format it is..
 	Common::SeekableReadStream *stream = res.load(name, libraryName);
-	Audio::AudioStream *audioStream = Audio::makeWAVStream(stream, DisposeAfterUse::YES);
+	Audio::AudioStream *audioStream = Audio::makeRawStream(stream, 11025, Audio::FLAG_UNSIGNED);
 	_mixer->playStream(Audio::Mixer::kSpeechSoundType, &_speechHandle, audioStream, -1, Audio::Mixer::kMaxChannelVolume);
 	_speechPlaying = true;
 }
@@ -282,7 +282,7 @@ void Sound::stopSpeech() {
 }
 
 bool Sound::isSpeechPlaying() {
-	_speechOn = _mixer->isSoundHandleActive(_speechHandle);
+	_speechPlaying = _mixer->isSoundHandleActive(_speechHandle);
 	return _speechPlaying;
 }
 






More information about the Scummvm-git-logs mailing list