[Scummvm-cvs-logs] SF.net SVN: scummvm:[53418] scummvm/trunk/engines/sword25
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Wed Oct 13 15:32:30 CEST 2010
Revision: 53418
http://scummvm.svn.sourceforge.net/scummvm/?rev=53418&view=rev
Author: thebluegr
Date: 2010-10-13 13:32:30 +0000 (Wed, 13 Oct 2010)
Log Message:
-----------
SWORD25: Renamed ENABLE_THEORADEC to USE_THEORADEC (like in configure)
Modified Paths:
--------------
scummvm/trunk/engines/sword25/fmv/movieplayer.cpp
scummvm/trunk/engines/sword25/fmv/movieplayer.h
scummvm/trunk/engines/sword25/fmv/movieplayer_script.cpp
scummvm/trunk/engines/sword25/fmv/theora_decoder.cpp
scummvm/trunk/engines/sword25/fmv/theora_decoder.h
scummvm/trunk/engines/sword25/fmv/yuvtorgba.cpp
scummvm/trunk/engines/sword25/fmv/yuvtorgba.h
scummvm/trunk/engines/sword25/kernel/kernel.cpp
scummvm/trunk/engines/sword25/kernel/kernel.h
Modified: scummvm/trunk/engines/sword25/fmv/movieplayer.cpp
===================================================================
--- scummvm/trunk/engines/sword25/fmv/movieplayer.cpp 2010-10-13 13:27:55 UTC (rev 53417)
+++ scummvm/trunk/engines/sword25/fmv/movieplayer.cpp 2010-10-13 13:32:30 UTC (rev 53418)
@@ -46,14 +46,14 @@
#define FLT_EPSILON 1.192092896e-07F /* smallest such that 1.0+FLT_EPSILON != 1.0 */
Service *OggTheora_CreateObject(Kernel *pKernel) {
-#ifdef ENABLE_THEORADEC
+#ifdef USE_THEORADEC
return new MoviePlayer(pKernel);
#else
return NULL;
#endif
}
-#ifdef ENABLE_THEORADEC
+#ifdef USE_THEORADEC
MoviePlayer::MoviePlayer(Kernel *pKernel) : Service(pKernel), _decoder(g_system->getMixer()) {
if (!registerScriptBindings())
BS_LOG_ERRORLN("Script bindings could not be registered.");
Modified: scummvm/trunk/engines/sword25/fmv/movieplayer.h
===================================================================
--- scummvm/trunk/engines/sword25/fmv/movieplayer.h 2010-10-13 13:27:55 UTC (rev 53417)
+++ scummvm/trunk/engines/sword25/fmv/movieplayer.h 2010-10-13 13:32:30 UTC (rev 53418)
@@ -40,7 +40,7 @@
#include "sword25/fmv/theora_decoder.h"
#include "sword25/gfx/bitmap.h"
-#ifdef ENABLE_THEORADEC
+#ifdef USE_THEORADEC
namespace Sword25 {
Modified: scummvm/trunk/engines/sword25/fmv/movieplayer_script.cpp
===================================================================
--- scummvm/trunk/engines/sword25/fmv/movieplayer_script.cpp 2010-10-13 13:27:55 UTC (rev 53417)
+++ scummvm/trunk/engines/sword25/fmv/movieplayer_script.cpp 2010-10-13 13:32:30 UTC (rev 53418)
@@ -42,7 +42,7 @@
namespace Sword25 {
int loadMovie(lua_State *L) {
-#ifdef ENABLE_THEORADEC
+#ifdef USE_THEORADEC
MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV();
BS_ASSERT(FMVPtr);
@@ -55,7 +55,7 @@
}
int unloadMovie(lua_State *L) {
-#ifdef ENABLE_THEORADEC
+#ifdef USE_THEORADEC
MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV();
BS_ASSERT(FMVPtr);
@@ -68,7 +68,7 @@
}
int play(lua_State *L) {
-#ifdef ENABLE_THEORADEC
+#ifdef USE_THEORADEC
MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV();
BS_ASSERT(FMVPtr);
@@ -81,7 +81,7 @@
}
int pause(lua_State *L) {
-#ifdef ENABLE_THEORADEC
+#ifdef USE_THEORADEC
MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV();
BS_ASSERT(FMVPtr);
@@ -94,7 +94,7 @@
}
int update(lua_State *L) {
-#ifdef ENABLE_THEORADEC
+#ifdef USE_THEORADEC
MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV();
BS_ASSERT(FMVPtr);
@@ -105,7 +105,7 @@
}
int isMovieLoaded(lua_State *L) {
-#ifdef ENABLE_THEORADEC
+#ifdef USE_THEORADEC
MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV();
BS_ASSERT(FMVPtr);
@@ -118,7 +118,7 @@
}
int isPaused(lua_State *L) {
-#ifdef ENABLE_THEORADEC
+#ifdef USE_THEORADEC
MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV();
BS_ASSERT(FMVPtr);
@@ -131,7 +131,7 @@
}
int getScaleFactor(lua_State *L) {
-#ifdef ENABLE_THEORADEC
+#ifdef USE_THEORADEC
MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV();
BS_ASSERT(FMVPtr);
@@ -144,7 +144,7 @@
}
int setScaleFactor(lua_State *L) {
-#ifdef ENABLE_THEORADEC
+#ifdef USE_THEORADEC
MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV();
BS_ASSERT(FMVPtr);
@@ -155,7 +155,7 @@
}
int getTime(lua_State *L) {
-#ifdef ENABLE_THEORADEC
+#ifdef USE_THEORADEC
MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV();
BS_ASSERT(FMVPtr);
@@ -183,7 +183,7 @@
{ 0, 0 }
};
-#ifdef ENABLE_THEORADEC
+#ifdef USE_THEORADEC
bool MoviePlayer::registerScriptBindings() {
Kernel *pKernel = Kernel::GetInstance();
BS_ASSERT(pKernel);
Modified: scummvm/trunk/engines/sword25/fmv/theora_decoder.cpp
===================================================================
--- scummvm/trunk/engines/sword25/fmv/theora_decoder.cpp 2010-10-13 13:27:55 UTC (rev 53417)
+++ scummvm/trunk/engines/sword25/fmv/theora_decoder.cpp 2010-10-13 13:32:30 UTC (rev 53418)
@@ -38,7 +38,7 @@
#include "sword25/fmv/theora_decoder.h"
-#ifdef ENABLE_THEORADEC
+#ifdef USE_THEORADEC
#include "sword25/fmv/yuvtorgba.h"
#include "common/system.h"
#include "sound/decoders/raw.h"
Modified: scummvm/trunk/engines/sword25/fmv/theora_decoder.h
===================================================================
--- scummvm/trunk/engines/sword25/fmv/theora_decoder.h 2010-10-13 13:27:55 UTC (rev 53417)
+++ scummvm/trunk/engines/sword25/fmv/theora_decoder.h 2010-10-13 13:32:30 UTC (rev 53418)
@@ -26,7 +26,7 @@
#ifndef SWORD25_THEORADECODER_H
#define SWORD25_THEORADECODER_H
-#ifdef ENABLE_THEORADEC
+#ifdef USE_THEORADEC
#include "graphics/video/video_decoder.h"
#include "sound/audiostream.h"
Modified: scummvm/trunk/engines/sword25/fmv/yuvtorgba.cpp
===================================================================
--- scummvm/trunk/engines/sword25/fmv/yuvtorgba.cpp 2010-10-13 13:27:55 UTC (rev 53417)
+++ scummvm/trunk/engines/sword25/fmv/yuvtorgba.cpp 2010-10-13 13:32:30 UTC (rev 53418)
@@ -34,7 +34,7 @@
#include "sword25/fmv/yuvtorgba.h"
-#ifdef ENABLE_THEORADEC
+#ifdef USE_THEORADEC
namespace Sword25 {
Modified: scummvm/trunk/engines/sword25/fmv/yuvtorgba.h
===================================================================
--- scummvm/trunk/engines/sword25/fmv/yuvtorgba.h 2010-10-13 13:27:55 UTC (rev 53417)
+++ scummvm/trunk/engines/sword25/fmv/yuvtorgba.h 2010-10-13 13:32:30 UTC (rev 53418)
@@ -37,7 +37,7 @@
#include "sword25/kernel/common.h"
-#ifdef ENABLE_THEORADEC
+#ifdef USE_THEORADEC
#include <theora/theora.h>
#include <theora/codec.h>
Modified: scummvm/trunk/engines/sword25/kernel/kernel.cpp
===================================================================
--- scummvm/trunk/engines/sword25/kernel/kernel.cpp 2010-10-13 13:27:55 UTC (rev 53417)
+++ scummvm/trunk/engines/sword25/kernel/kernel.cpp 2010-10-13 13:32:30 UTC (rev 53418)
@@ -430,7 +430,7 @@
// -----------------------------------------------------------------------------
-#ifdef ENABLE_THEORADEC
+#ifdef USE_THEORADEC
/**
* Returns a pointer to the movie player, or NULL if it is not active
*/
Modified: scummvm/trunk/engines/sword25/kernel/kernel.h
===================================================================
--- scummvm/trunk/engines/sword25/kernel/kernel.h 2010-10-13 13:27:55 UTC (rev 53417)
+++ scummvm/trunk/engines/sword25/kernel/kernel.h 2010-10-13 13:32:30 UTC (rev 53418)
@@ -201,7 +201,7 @@
*/
ScriptEngine *GetScript();
-#ifdef ENABLE_THEORADEC
+#ifdef USE_THEORADEC
/**
* Returns a pointer to the movie player, or NULL if it is not active
*/
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