aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/console.cpp
diff options
context:
space:
mode:
authorMatthew Hoops2012-07-22 23:17:36 -0400
committerMatthew Hoops2012-07-22 23:17:36 -0400
commitd4231fda1cb2399e123054ddaaeca2b4c2749966 (patch)
treea87675430acb1db2310c296e5548187d2534db08 /engines/sci/console.cpp
parent0f0c6f935443212d76422959d040b87fc78d02c7 (diff)
downloadscummvm-rg350-d4231fda1cb2399e123054ddaaeca2b4c2749966.tar.gz
scummvm-rg350-d4231fda1cb2399e123054ddaaeca2b4c2749966.tar.bz2
scummvm-rg350-d4231fda1cb2399e123054ddaaeca2b4c2749966.zip
SCI: Rewrite RobotDecoder to use the AdvancedVideoDecoder API
Diffstat (limited to 'engines/sci/console.cpp')
-rw-r--r--engines/sci/console.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp
index a6a6d4496f..9b5ef35e92 100644
--- a/engines/sci/console.cpp
+++ b/engines/sci/console.cpp
@@ -251,25 +251,25 @@ void Console::postEnter() {
if (_videoFile.hasSuffix(".seq")) {
videoDecoder = new SEQDecoder(_videoFrameDelay);
- ((Video::AdvancedVideoDecoder *)videoDecoder)->start(); // TODO: Remove after new API is complete
#ifdef ENABLE_SCI32
} else if (_videoFile.hasSuffix(".vmd")) {
videoDecoder = new Video::VMDDecoder(g_system->getMixer());
} else if (_videoFile.hasSuffix(".rbt")) {
- videoDecoder = new RobotDecoder(g_system->getMixer(), _engine->getPlatform() == Common::kPlatformMacintosh);
+ videoDecoder = new RobotDecoder(_engine->getPlatform() == Common::kPlatformMacintosh);
} else if (_videoFile.hasSuffix(".duk")) {
duckMode = true;
videoDecoder = new Video::AVIDecoder();
- ((Video::AdvancedVideoDecoder *)videoDecoder)->start();
#endif
} else if (_videoFile.hasSuffix(".avi")) {
videoDecoder = new Video::AVIDecoder();
- ((Video::AdvancedVideoDecoder *)videoDecoder)->start();
} else {
warning("Unrecognized video type");
}
if (videoDecoder && videoDecoder->loadFile(_videoFile)) {
+ if (!_videoFile.hasSuffix(".vmd")) // TODO: Remove after new API is complete
+ ((Video::AdvancedVideoDecoder *)videoDecoder)->start();
+
_engine->_gfxCursor->kernelHide();
#ifdef ENABLE_SCI32