[Scummvm-cvs-logs] SF.net SVN: scummvm:[53439] scummvm/trunk/engines/sword25

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Wed Oct 13 19:42:56 CEST 2010


Revision: 53439
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53439&view=rev
Author:   thebluegr
Date:     2010-10-13 17:42:56 +0000 (Wed, 13 Oct 2010)

Log Message:
-----------
SWORD25: Hopefully fix compilation when libtheora is not present

Modified Paths:
--------------
    scummvm/trunk/engines/sword25/fmv/movieplayer.cpp
    scummvm/trunk/engines/sword25/kernel/service_ids.h

Modified: scummvm/trunk/engines/sword25/fmv/movieplayer.cpp
===================================================================
--- scummvm/trunk/engines/sword25/fmv/movieplayer.cpp	2010-10-13 17:33:13 UTC (rev 53438)
+++ scummvm/trunk/engines/sword25/fmv/movieplayer.cpp	2010-10-13 17:42:56 UTC (rev 53439)
@@ -39,6 +39,8 @@
 #include "sword25/package/packagemanager.h"
 #include "sword25/sfx/soundengine.h"
 
+#ifdef USE_THEORADEC
+
 namespace Sword25 {
 
 #define BS_LOG_PREFIX "MOVIEPLAYER"
@@ -46,14 +48,9 @@
 #define FLT_EPSILON     1.192092896e-07F        /* smallest such that 1.0+FLT_EPSILON != 1.0 */
 
 Service *OggTheora_CreateObject(Kernel *pKernel) {
-#ifdef USE_THEORADEC
 	return new MoviePlayer(pKernel);
-#else
-	return NULL;
-#endif
 }
 
-#ifdef USE_THEORADEC
 MoviePlayer::MoviePlayer(Kernel *pKernel) : Service(pKernel), _decoder(g_system->getMixer()) {
 	if (!registerScriptBindings())
 		BS_LOG_ERRORLN("Script bindings could not be registered.");
@@ -156,6 +153,7 @@
 	return _decoder.getElapsedTime() / 1000.0;
 }
 
+} // End of namespace Sword25
+
 #endif
 
-} // End of namespace Sword25

Modified: scummvm/trunk/engines/sword25/kernel/service_ids.h
===================================================================
--- scummvm/trunk/engines/sword25/kernel/service_ids.h	2010-10-13 17:33:13 UTC (rev 53438)
+++ scummvm/trunk/engines/sword25/kernel/service_ids.h	2010-10-13 17:42:56 UTC (rev 53439)
@@ -55,7 +55,11 @@
 Service *SoundEngine_CreateObject(Kernel *pKernel);
 Service *LuaScriptEngine_CreateObject(Kernel *pKernel);
 Service *Geometry_CreateObject(Kernel *pKernel);
+#ifndef USE_THEORADEC
 Service *OggTheora_CreateObject(Kernel *pKernel);
+#else
+Service *OggTheora_CreateObject(Kernel *pKernel) { return NULL; }
+#endif
 
 // Services are recorded in this table
 const BS_ServiceInfo BS_SERVICE_TABLE[] = {


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