diff options
| author | Einar Johan Trøan Sømåen | 2012-07-19 19:17:05 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-07-19 19:17:05 +0200 |
| commit | a3e8ad4c52f2ad484e94fc8b641e7c7b67b44c04 (patch) | |
| tree | d3fc1c23ed6196a24266825f2d77f963d8d98656 /engines/wintermute/video | |
| parent | def3cd92570ac8138441cd0e7492d0b7bdc61f91 (diff) | |
| download | scummvm-rg350-a3e8ad4c52f2ad484e94fc8b641e7c7b67b44c04.tar.gz scummvm-rg350-a3e8ad4c52f2ad484e94fc8b641e7c7b67b44c04.tar.bz2 scummvm-rg350-a3e8ad4c52f2ad484e94fc8b641e7c7b67b44c04.zip | |
WINTERMUTE: Move all the gfx-related files to a subfolder, and rename SDL->OSystem
Diffstat (limited to 'engines/wintermute/video')
| -rw-r--r-- | engines/wintermute/video/VidTheoraPlayer.cpp | 5 | ||||
| -rw-r--r-- | engines/wintermute/video/VidTheoraPlayer.h | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/engines/wintermute/video/VidTheoraPlayer.cpp b/engines/wintermute/video/VidTheoraPlayer.cpp index d7e8850177..3bbd2172f7 100644 --- a/engines/wintermute/video/VidTheoraPlayer.cpp +++ b/engines/wintermute/video/VidTheoraPlayer.cpp @@ -32,7 +32,8 @@ #include "engines/wintermute/Base/BBase.h" #include "engines/wintermute/Base/BGame.h" #include "engines/wintermute/Base/BFileManager.h" -#include "engines/wintermute/Base/BSurfaceSDL.h" +#include "engines/wintermute/Base/gfx/osystem/base_surface_osystem.h" +#include "engines/wintermute/Base/gfx/base_image.h" #include "engines/wintermute/Base/BSoundMgr.h" #include "engines/wintermute/utils/utils.h" #include "engines/wintermute/PlatformSDL.h" @@ -155,7 +156,7 @@ bool CVidTheoraPlayer::initialize(const Common::String &filename, const Common:: // Additional setup. _surface.create(_theoraDecoder->getWidth(), _theoraDecoder->getHeight(), _theoraDecoder->getPixelFormat()); - _texture = new CBSurfaceSDL(_gameRef); + _texture = new CBSurfaceOSystem(_gameRef); _texture->create(_theoraDecoder->getWidth(), _theoraDecoder->getHeight()); _state = THEORA_STATE_PLAYING; _playZoom = 100; diff --git a/engines/wintermute/video/VidTheoraPlayer.h b/engines/wintermute/video/VidTheoraPlayer.h index 74fc0ce5b4..f403a82f64 100644 --- a/engines/wintermute/video/VidTheoraPlayer.h +++ b/engines/wintermute/video/VidTheoraPlayer.h @@ -31,14 +31,14 @@ #include "engines/wintermute/Base/BBase.h" #include "engines/wintermute/Base/file/BFile.h" -#include "engines/wintermute/Base/BSurface.h" -#include "engines/wintermute/Base/BImage.h" #include "engines/wintermute/persistent.h" #include "video/video_decoder.h" #include "common/stream.h" +#include "graphics/surface.h" namespace WinterMute { - +class CBSurface; +class CBImage; class CVidTheoraPlayer : public CBBase { private: enum { |