diff options
author | Filippos Karapetis | 2010-10-13 13:27:55 +0000 |
---|---|---|
committer | Filippos Karapetis | 2010-10-13 13:27:55 +0000 |
commit | f2d9319d9eca6e1d6b30f9aac3230c158ec2a942 (patch) | |
tree | 1371e64cdc1be72b2cfcfa349a6e15da86c83cf7 /engines/sword25 | |
parent | 681ec592927b8d9a81eed7b1038743bf8e378de2 (diff) | |
download | scummvm-rg350-f2d9319d9eca6e1d6b30f9aac3230c158ec2a942.tar.gz scummvm-rg350-f2d9319d9eca6e1d6b30f9aac3230c158ec2a942.tar.bz2 scummvm-rg350-f2d9319d9eca6e1d6b30f9aac3230c158ec2a942.zip |
SWORD25: Renamed ENABLE_THEORA to ENABLE_THEORADEC (like in configure)
svn-id: r53417
Diffstat (limited to 'engines/sword25')
-rw-r--r-- | engines/sword25/fmv/movieplayer.cpp | 4 | ||||
-rw-r--r-- | engines/sword25/fmv/movieplayer.h | 2 | ||||
-rw-r--r-- | engines/sword25/fmv/movieplayer_script.cpp | 22 | ||||
-rw-r--r-- | engines/sword25/fmv/theora_decoder.cpp | 2 | ||||
-rw-r--r-- | engines/sword25/fmv/theora_decoder.h | 4 | ||||
-rw-r--r-- | engines/sword25/fmv/yuvtorgba.cpp | 2 | ||||
-rw-r--r-- | engines/sword25/fmv/yuvtorgba.h | 3 | ||||
-rw-r--r-- | engines/sword25/kernel/kernel.cpp | 2 | ||||
-rw-r--r-- | engines/sword25/kernel/kernel.h | 3 |
9 files changed, 20 insertions, 24 deletions
diff --git a/engines/sword25/fmv/movieplayer.cpp b/engines/sword25/fmv/movieplayer.cpp index 81a39b385d..75219ef25f 100644 --- a/engines/sword25/fmv/movieplayer.cpp +++ b/engines/sword25/fmv/movieplayer.cpp @@ -46,14 +46,14 @@ namespace Sword25 { #define FLT_EPSILON 1.192092896e-07F /* smallest such that 1.0+FLT_EPSILON != 1.0 */ Service *OggTheora_CreateObject(Kernel *pKernel) { -#ifdef ENABLE_THEORA +#ifdef ENABLE_THEORADEC return new MoviePlayer(pKernel); #else return NULL; #endif } -#ifdef ENABLE_THEORA +#ifdef ENABLE_THEORADEC MoviePlayer::MoviePlayer(Kernel *pKernel) : Service(pKernel), _decoder(g_system->getMixer()) { if (!registerScriptBindings()) BS_LOG_ERRORLN("Script bindings could not be registered."); diff --git a/engines/sword25/fmv/movieplayer.h b/engines/sword25/fmv/movieplayer.h index d661b4cb79..083a364865 100644 --- a/engines/sword25/fmv/movieplayer.h +++ b/engines/sword25/fmv/movieplayer.h @@ -40,7 +40,7 @@ #include "sword25/fmv/theora_decoder.h" #include "sword25/gfx/bitmap.h" -#ifdef ENABLE_THEORA +#ifdef ENABLE_THEORADEC namespace Sword25 { diff --git a/engines/sword25/fmv/movieplayer_script.cpp b/engines/sword25/fmv/movieplayer_script.cpp index 7825911525..032159762a 100644 --- a/engines/sword25/fmv/movieplayer_script.cpp +++ b/engines/sword25/fmv/movieplayer_script.cpp @@ -42,7 +42,7 @@ namespace Sword25 { int loadMovie(lua_State *L) { -#ifdef ENABLE_THEORA +#ifdef ENABLE_THEORADEC MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV(); BS_ASSERT(FMVPtr); @@ -55,7 +55,7 @@ int loadMovie(lua_State *L) { } int unloadMovie(lua_State *L) { -#ifdef ENABLE_THEORA +#ifdef ENABLE_THEORADEC MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV(); BS_ASSERT(FMVPtr); @@ -68,7 +68,7 @@ int unloadMovie(lua_State *L) { } int play(lua_State *L) { -#ifdef ENABLE_THEORA +#ifdef ENABLE_THEORADEC MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV(); BS_ASSERT(FMVPtr); @@ -81,7 +81,7 @@ int play(lua_State *L) { } int pause(lua_State *L) { -#ifdef ENABLE_THEORA +#ifdef ENABLE_THEORADEC MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV(); BS_ASSERT(FMVPtr); @@ -94,7 +94,7 @@ int pause(lua_State *L) { } int update(lua_State *L) { -#ifdef ENABLE_THEORA +#ifdef ENABLE_THEORADEC MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV(); BS_ASSERT(FMVPtr); @@ -105,7 +105,7 @@ int update(lua_State *L) { } int isMovieLoaded(lua_State *L) { -#ifdef ENABLE_THEORA +#ifdef ENABLE_THEORADEC MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV(); BS_ASSERT(FMVPtr); @@ -118,7 +118,7 @@ int isMovieLoaded(lua_State *L) { } int isPaused(lua_State *L) { -#ifdef ENABLE_THEORA +#ifdef ENABLE_THEORADEC MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV(); BS_ASSERT(FMVPtr); @@ -131,7 +131,7 @@ int isPaused(lua_State *L) { } int getScaleFactor(lua_State *L) { -#ifdef ENABLE_THEORA +#ifdef ENABLE_THEORADEC MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV(); BS_ASSERT(FMVPtr); @@ -144,7 +144,7 @@ int getScaleFactor(lua_State *L) { } int setScaleFactor(lua_State *L) { -#ifdef ENABLE_THEORA +#ifdef ENABLE_THEORADEC MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV(); BS_ASSERT(FMVPtr); @@ -155,7 +155,7 @@ int setScaleFactor(lua_State *L) { } int getTime(lua_State *L) { -#ifdef ENABLE_THEORA +#ifdef ENABLE_THEORADEC MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV(); BS_ASSERT(FMVPtr); @@ -183,7 +183,7 @@ const luaL_reg LIBRARY_FUNCTIONS[] = { { 0, 0 } }; -#ifdef ENABLE_THEORA +#ifdef ENABLE_THEORADEC bool MoviePlayer::registerScriptBindings() { Kernel *pKernel = Kernel::GetInstance(); BS_ASSERT(pKernel); diff --git a/engines/sword25/fmv/theora_decoder.cpp b/engines/sword25/fmv/theora_decoder.cpp index af69730dea..66cd70bfee 100644 --- a/engines/sword25/fmv/theora_decoder.cpp +++ b/engines/sword25/fmv/theora_decoder.cpp @@ -38,7 +38,7 @@ #include "sword25/fmv/theora_decoder.h" -#ifdef ENABLE_THEORA +#ifdef ENABLE_THEORADEC #include "sword25/fmv/yuvtorgba.h" #include "common/system.h" #include "sound/decoders/raw.h" diff --git a/engines/sword25/fmv/theora_decoder.h b/engines/sword25/fmv/theora_decoder.h index e63f395e6f..7e59df52cc 100644 --- a/engines/sword25/fmv/theora_decoder.h +++ b/engines/sword25/fmv/theora_decoder.h @@ -26,9 +26,7 @@ #ifndef SWORD25_THEORADECODER_H #define SWORD25_THEORADECODER_H -#define ENABLE_THEORA // comment out to disable the Theora decoder, which effectively disables the game's videos - -#ifdef ENABLE_THEORA +#ifdef ENABLE_THEORADEC #include "graphics/video/video_decoder.h" #include "sound/audiostream.h" diff --git a/engines/sword25/fmv/yuvtorgba.cpp b/engines/sword25/fmv/yuvtorgba.cpp index 1796388ab8..b17de73b27 100644 --- a/engines/sword25/fmv/yuvtorgba.cpp +++ b/engines/sword25/fmv/yuvtorgba.cpp @@ -34,7 +34,7 @@ #include "sword25/fmv/yuvtorgba.h" -#ifdef ENABLE_THEORA +#ifdef ENABLE_THEORADEC namespace Sword25 { diff --git a/engines/sword25/fmv/yuvtorgba.h b/engines/sword25/fmv/yuvtorgba.h index 16a403acdd..bef00f56a3 100644 --- a/engines/sword25/fmv/yuvtorgba.h +++ b/engines/sword25/fmv/yuvtorgba.h @@ -36,9 +36,8 @@ #define SWORD25_YUVTORGBA_H #include "sword25/kernel/common.h" -#include "sword25/fmv/theora_decoder.h" // for ENABLE_THEORA -#ifdef ENABLE_THEORA +#ifdef ENABLE_THEORADEC #include <theora/theora.h> #include <theora/codec.h> diff --git a/engines/sword25/kernel/kernel.cpp b/engines/sword25/kernel/kernel.cpp index cbe71edcbb..a05d6b1610 100644 --- a/engines/sword25/kernel/kernel.cpp +++ b/engines/sword25/kernel/kernel.cpp @@ -430,7 +430,7 @@ ScriptEngine *Kernel::GetScript() { // ----------------------------------------------------------------------------- -#ifdef ENABLE_THEORA +#ifdef ENABLE_THEORADEC /** * Returns a pointer to the movie player, or NULL if it is not active */ diff --git a/engines/sword25/kernel/kernel.h b/engines/sword25/kernel/kernel.h index 0962957d10..0b5cfa3b02 100644 --- a/engines/sword25/kernel/kernel.h +++ b/engines/sword25/kernel/kernel.h @@ -55,7 +55,6 @@ #include "sword25/kernel/common.h" #include "sword25/kernel/window.h" #include "sword25/kernel/resmanager.h" -#include "sword25/fmv/theora_decoder.h" // for ENABLE_THEORA namespace Sword25 { @@ -202,7 +201,7 @@ public: */ ScriptEngine *GetScript(); -#ifdef ENABLE_THEORA +#ifdef ENABLE_THEORADEC /** * Returns a pointer to the movie player, or NULL if it is not active */ |