diff options
| author | Sven Hesse | 2010-08-08 00:40:52 +0000 |
|---|---|---|
| committer | Sven Hesse | 2010-08-08 00:40:52 +0000 |
| commit | 160172d0e8c3e2cd031fcbe559ebc743e644fc65 (patch) | |
| tree | 0effe926ff9f619b74bc2df44ed6463b3cdf0b32 /engines | |
| parent | dcf8298a75cfeb44c6059f03b57f0a61bc062ac0 (diff) | |
| download | scummvm-rg350-160172d0e8c3e2cd031fcbe559ebc743e644fc65.tar.gz scummvm-rg350-160172d0e8c3e2cd031fcbe559ebc743e644fc65.tar.bz2 scummvm-rg350-160172d0e8c3e2cd031fcbe559ebc743e644fc65.zip | |
GOB: Hook the new IMDDecoder into VideoPlayer
svn-id: r51863
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/gob/videoplayer.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/engines/gob/videoplayer.cpp b/engines/gob/videoplayer.cpp index a32d56512b..2a7ae80dca 100644 --- a/engines/gob/videoplayer.cpp +++ b/engines/gob/videoplayer.cpp @@ -627,12 +627,10 @@ Graphics::CoktelDecoder *VideoPlayer::openVideo(const Common::String &file, Prop Graphics::CoktelDecoder *video = 0; if (properties.type == kVideoTypeIMD) - warning("TODO: IMD"); - //_video = new Graphics::Imd(); - else if (properties.type == kVideoTypePreIMD) { - warning("PreIMDDecoder \"%s\" %dx%d", fileName.c_str(), properties.width, properties.height); + video = new Graphics::IMDDecoder(*_vm->_mixer, Audio::Mixer::kSFXSoundType); + else if (properties.type == kVideoTypePreIMD) video = new Graphics::PreIMDDecoder(properties.width, properties.height, *_vm->_mixer, Audio::Mixer::kSFXSoundType); - } else if (properties.type == kVideoTypeVMD) + else if (properties.type == kVideoTypeVMD) warning("TODO: VMD"); //_video = new Graphics::Vmd(_vm->_video->_palLUT); else if (properties.type == kVideoTypeRMD) @@ -651,6 +649,9 @@ Graphics::CoktelDecoder *VideoPlayer::openVideo(const Common::String &file, Prop return 0; } + properties.width = video->getWidth(); + properties.height = video->getHeight(); + return video; } |