[Scummvm-cvs-logs] SF.net SVN: scummvm: [24570] scummvm/branches/branch-0-9-0/engines/kyra/ sound.cpp
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Sun Oct 29 16:44:48 CET 2006
Revision: 24570
http://svn.sourceforge.net/scummvm/?rev=24570&view=rev
Author: lordhoto
Date: 2006-10-29 07:44:43 -0800 (Sun, 29 Oct 2006)
Log Message:
-----------
Always stop the audio handle in Sound::voicePlay. (backport)
Modified Paths:
--------------
scummvm/branches/branch-0-9-0/engines/kyra/sound.cpp
Modified: scummvm/branches/branch-0-9-0/engines/kyra/sound.cpp
===================================================================
--- scummvm/branches/branch-0-9-0/engines/kyra/sound.cpp 2006-10-29 15:27:03 UTC (rev 24569)
+++ scummvm/branches/branch-0-9-0/engines/kyra/sound.cpp 2006-10-29 15:44:43 UTC (rev 24570)
@@ -72,12 +72,13 @@
return;
Common::MemoryReadStream vocStream(fileData, fileSize);
- _mixer->stopHandle(_vocHandle);
_currentVocFile = Audio::makeVOCStream(vocStream);
}
- if (_currentVocFile)
+ if (_currentVocFile) {
+ _mixer->stopHandle(_vocHandle);
_mixer->playInputStream(Audio::Mixer::kSpeechSoundType, &_vocHandle, _currentVocFile);
+ }
delete [] fileData;
fileSize = 0;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list