diff options
| author | Matthew Hoops | 2012-08-16 12:17:23 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2012-08-16 12:17:23 -0400 |
| commit | 7294a1cbcf1cf5e8c846faf8838e537bd8c638dc (patch) | |
| tree | 37f8c97ba038b72744e8341f9b23add9fcd68281 /engines/sci/console.cpp | |
| parent | 92432a136bff7c327b5328cc10a84198f571b0d0 (diff) | |
| download | scummvm-rg350-7294a1cbcf1cf5e8c846faf8838e537bd8c638dc.tar.gz scummvm-rg350-7294a1cbcf1cf5e8c846faf8838e537bd8c638dc.tar.bz2 scummvm-rg350-7294a1cbcf1cf5e8c846faf8838e537bd8c638dc.zip | |
VIDEO: Remove the Coktel video code from using the VideoDecoder API
After discussing with DrMcCoy, we felt this the best way to proceed. A wrapper class that implements AdvancedVideoDecoder is still around for use in SCI.
Diffstat (limited to 'engines/sci/console.cpp')
| -rw-r--r-- | engines/sci/console.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp index 9b5ef35e92..de852ca9c0 100644 --- a/engines/sci/console.cpp +++ b/engines/sci/console.cpp @@ -253,7 +253,7 @@ void Console::postEnter() { videoDecoder = new SEQDecoder(_videoFrameDelay); #ifdef ENABLE_SCI32 } else if (_videoFile.hasSuffix(".vmd")) { - videoDecoder = new Video::VMDDecoder(g_system->getMixer()); + videoDecoder = new Video::AdvancedVMDDecoder(); } else if (_videoFile.hasSuffix(".rbt")) { videoDecoder = new RobotDecoder(_engine->getPlatform() == Common::kPlatformMacintosh); } else if (_videoFile.hasSuffix(".duk")) { @@ -267,8 +267,7 @@ void Console::postEnter() { } if (videoDecoder && videoDecoder->loadFile(_videoFile)) { - if (!_videoFile.hasSuffix(".vmd")) // TODO: Remove after new API is complete - ((Video::AdvancedVideoDecoder *)videoDecoder)->start(); + ((Video::AdvancedVideoDecoder *)videoDecoder)->start(); _engine->_gfxCursor->kernelHide(); |