diff options
| author | Paul Gilbert | 2010-09-01 07:35:38 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2010-10-12 23:23:10 +0000 |
| commit | 3d3f1db15c50c9b675e29e0a10ee896fd8928445 (patch) | |
| tree | 8ea732cc77df1b4cb7459d3aeef3fb0b250b4a02 /engines/sword25/fmv/movieplayer.h | |
| parent | 579d872e96862882d4cf92e82a0e8deb82496020 (diff) | |
| download | scummvm-rg350-3d3f1db15c50c9b675e29e0a10ee896fd8928445.tar.gz scummvm-rg350-3d3f1db15c50c9b675e29e0a10ee896fd8928445.tar.bz2 scummvm-rg350-3d3f1db15c50c9b675e29e0a10ee896fd8928445.zip | |
SWORD25: Merge of my pending changes to movie playback
svn-id: r53300
Diffstat (limited to 'engines/sword25/fmv/movieplayer.h')
| -rw-r--r-- | engines/sword25/fmv/movieplayer.h | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/engines/sword25/fmv/movieplayer.h b/engines/sword25/fmv/movieplayer.h index afca1eb808..cdbcf13f53 100644 --- a/engines/sword25/fmv/movieplayer.h +++ b/engines/sword25/fmv/movieplayer.h @@ -41,11 +41,14 @@ #include "sword25/kernel/common.h" #include "sword25/kernel/service.h" -#include "graphics/surface.h" +#include "sword25/fmv/theora_decoder.h" +#include "sword25/gfx/bitmap.h" namespace Sword25 { -class TheoraDecoder; +// ----------------------------------------------------------------------------- +// Class definitions +// ----------------------------------------------------------------------------- class MoviePlayer : public Service { public: @@ -54,10 +57,10 @@ public: // ----------------------------------------------------------------------------- MoviePlayer(Kernel *pKernel); - ~MoviePlayer() {}; + ~MoviePlayer(); // ----------------------------------------------------------------------------- - // Abstract interface must be implemented by each Movie Player + // Player interface must be implemented by a Movie Player // ----------------------------------------------------------------------------- /** @@ -136,12 +139,12 @@ public: * @remark This method can only be called when IsMovieLoaded() returns true. */ double GetTime(); - private: bool _RegisterScriptBindings(); - TheoraDecoder *_decoder; - Graphics::Surface *_backSurface; + TheoraDecoder _decoder; + + RenderObjectPtr<Bitmap> _outputBitmap; }; } // End of namespace Sword25 |