[Scummvm-cvs-logs] SF.net SVN: scummvm:[55428] scummvm/trunk/engines/sci/graphics/robot.cpp
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Sat Jan 22 15:58:17 CET 2011
Revision: 55428
http://scummvm.svn.sourceforge.net/scummvm/?rev=55428&view=rev
Author: thebluegr
Date: 2011-01-22 14:58:17 +0000 (Sat, 22 Jan 2011)
Log Message:
-----------
SCI: Moved the robot audio playing test code inside GfxRobot::playAudio()
Modified Paths:
--------------
scummvm/trunk/engines/sci/graphics/robot.cpp
Modified: scummvm/trunk/engines/sci/graphics/robot.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/robot.cpp 2011-01-22 14:32:39 UTC (rev 55427)
+++ scummvm/trunk/engines/sci/graphics/robot.cpp 2011-01-22 14:58:17 UTC (rev 55428)
@@ -161,15 +161,6 @@
}
void GfxRobot::drawNextFrame() {
- // Play the audio of the robot file (for debugging)
-#if 0
- if (_hasSound) {
- Audio::SoundHandle _audioHandle;
- Audio::AudioStream *audioStream = g_sci->_audio->getRobotAudioStream(_resourceData);
- g_system->getMixer()->playStream(Audio::Mixer::kSpeechSoundType, &_audioHandle, audioStream);
- }
-#endif
-
int width, height;
byte *pixels = assembleVideoFrame(_curFrame);
@@ -305,7 +296,13 @@
}
void GfxRobot::playAudio() {
-// Audio::Mixer *mixer = g_system->getMixer();
+#if 0
+ if (_hasSound) {
+ Audio::SoundHandle _audioHandle;
+ Audio::AudioStream *audioStream = g_sci->_audio->getRobotAudioStream(_resourceData);
+ g_system->getMixer()->playStream(Audio::Mixer::kSpeechSoundType, &_audioHandle, audioStream);
+ }
+#endif
}
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