diff options
| author | Einar Johan T. Sømåen | 2012-06-07 12:53:13 +0200 |
|---|---|---|
| committer | Einar Johan T. Sømåen | 2012-06-07 12:53:13 +0200 |
| commit | 6e04d78a3652d9eea9ba7220967afe3d6c1cd89f (patch) | |
| tree | 5b12a71bcc7db894c7bc0b632f2beb7fa1b1b13c /engines/wintermute | |
| parent | ff28c0215b32d1dbfb301bc29bbded619a92e40f (diff) | |
| download | scummvm-rg350-6e04d78a3652d9eea9ba7220967afe3d6c1cd89f.tar.gz scummvm-rg350-6e04d78a3652d9eea9ba7220967afe3d6c1cd89f.tar.bz2 scummvm-rg350-6e04d78a3652d9eea9ba7220967afe3d6c1cd89f.zip | |
WINTERMUTE: Fix compile on linux again.
Diffstat (limited to 'engines/wintermute')
| -rw-r--r-- | engines/wintermute/module.mk | 1 | ||||
| -rw-r--r-- | engines/wintermute/video/VidTheoraPlayer.cpp | 2 | ||||
| -rw-r--r-- | engines/wintermute/video/VidTheoraPlayer.h | 9 |
3 files changed, 9 insertions, 3 deletions
diff --git a/engines/wintermute/module.mk b/engines/wintermute/module.mk index 217317ece6..ed94ebf2fc 100644 --- a/engines/wintermute/module.mk +++ b/engines/wintermute/module.mk @@ -117,6 +117,7 @@ MODULE_OBJS := \ utils/utils.o \ video/VidPlayer.o \ video/VidTheoraPlayer.o \ + video/decoders/theora_decoder.o \ wintermute.o MODULE_DIRS += \ diff --git a/engines/wintermute/video/VidTheoraPlayer.cpp b/engines/wintermute/video/VidTheoraPlayer.cpp index 05691d8fdb..f6733c3fde 100644 --- a/engines/wintermute/video/VidTheoraPlayer.cpp +++ b/engines/wintermute/video/VidTheoraPlayer.cpp @@ -18,7 +18,7 @@ #include "engines/wintermute/dcgf.h" -#include "engines/wintermute/video/vidtheoraplayer.h" +#include "engines/wintermute/video/VidTheoraPlayer.h" #include "engines/wintermute/Base/BGame.h" #include "engines/wintermute/Base/BFileManager.h" #include "engines/wintermute/Base/BSurfaceSDL.h" diff --git a/engines/wintermute/video/VidTheoraPlayer.h b/engines/wintermute/video/VidTheoraPlayer.h index a27ce04042..0ce6e42b5a 100644 --- a/engines/wintermute/video/VidTheoraPlayer.h +++ b/engines/wintermute/video/VidTheoraPlayer.h @@ -32,7 +32,12 @@ namespace WinterMute { class CVidTheoraPlayer : public CBBase { private: - enum { THEORA_STATE_NONE = 0, THEORA_STATE_PLAYING = 1, THEORA_STATE_PAUSED = 2, THEORA_STATE_FINISHED = 3 }; + enum { + THEORA_STATE_NONE = 0, + THEORA_STATE_PLAYING = 1, + THEORA_STATE_PAUSED = 2, + THEORA_STATE_FINISHED = 3 + }; Video::VideoDecoder *_theoraDecoder; Graphics::Surface _surface; public: @@ -140,7 +145,7 @@ private: bool _frameRendered; - void getIsFrameReady() { + bool getIsFrameReady() { return _videoFrameReady; } private: |