diff options
| author | Einar Johan Trøan Sømåen | 2012-08-31 13:11:31 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-08-31 13:11:31 +0200 |
| commit | 3fe7f2cbe2b70eaa824b7159d94d40c2280006a3 (patch) | |
| tree | ea592da00ad567c75008137f79eeba16c3ba40c4 /engines/sci/console.cpp | |
| parent | 246109839b9c196e9181a6f619c15694456b9aec (diff) | |
| parent | 10a947a0be80ea8c5c88bd3493a5057b1223ce45 (diff) | |
| download | scummvm-rg350-3fe7f2cbe2b70eaa824b7159d94d40c2280006a3.tar.gz scummvm-rg350-3fe7f2cbe2b70eaa824b7159d94d40c2280006a3.tar.bz2 scummvm-rg350-3fe7f2cbe2b70eaa824b7159d94d40c2280006a3.zip | |
Merge remote-tracking branch 'origin/master' into wintermute
Diffstat (limited to 'engines/sci/console.cpp')
| -rw-r--r-- | engines/sci/console.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp index 564bbbbd79..1889d53480 100644 --- a/engines/sci/console.cpp +++ b/engines/sci/console.cpp @@ -250,20 +250,18 @@ void Console::postEnter() { #endif if (_videoFile.hasSuffix(".seq")) { - SeqDecoder *seqDecoder = new SeqDecoder(); - seqDecoder->setFrameDelay(_videoFrameDelay); - videoDecoder = seqDecoder; + 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(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(g_system->getMixer()); + videoDecoder = new Video::AVIDecoder(); #endif } else if (_videoFile.hasSuffix(".avi")) { - videoDecoder = new Video::AviDecoder(g_system->getMixer()); + videoDecoder = new Video::AVIDecoder(); } else { warning("Unrecognized video type"); } |