[Scummvm-cvs-logs] SF.net SVN: scummvm:[51863] scummvm/trunk/engines/gob/videoplayer.cpp

drmccoy at users.sourceforge.net drmccoy at users.sourceforge.net
Sun Aug 8 02:40:52 CEST 2010


Revision: 51863
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51863&view=rev
Author:   drmccoy
Date:     2010-08-08 00:40:52 +0000 (Sun, 08 Aug 2010)

Log Message:
-----------
GOB: Hook the new IMDDecoder into VideoPlayer

Modified Paths:
--------------
    scummvm/trunk/engines/gob/videoplayer.cpp

Modified: scummvm/trunk/engines/gob/videoplayer.cpp
===================================================================
--- scummvm/trunk/engines/gob/videoplayer.cpp	2010-08-08 00:40:24 UTC (rev 51862)
+++ scummvm/trunk/engines/gob/videoplayer.cpp	2010-08-08 00:40:52 UTC (rev 51863)
@@ -627,12 +627,10 @@
 
 	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 @@
 		return 0;
 	}
 
+	properties.width  = video->getWidth();
+	properties.height = video->getHeight();
+
 	return video;
 }
 


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