diff options
| author | Matthew Hoops | 2012-01-07 00:20:27 -0500 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2012-02-23 22:48:18 +0100 |
| commit | 8812f885bc95f0e4af05c333780eb77a8c2eaa19 (patch) | |
| tree | d9f434b6254b3bb943256328f6242dcdaec23717 /engines/sword2/animation.h | |
| parent | df21e72fe22132a802856bccc5f4bba27e4d3c17 (diff) | |
| download | scummvm-rg350-8812f885bc95f0e4af05c333780eb77a8c2eaa19.tar.gz scummvm-rg350-8812f885bc95f0e4af05c333780eb77a8c2eaa19.tar.bz2 scummvm-rg350-8812f885bc95f0e4af05c333780eb77a8c2eaa19.zip | |
SWORD2: Add support for PSX stream playback
Diffstat (limited to 'engines/sword2/animation.h')
| -rw-r--r-- | engines/sword2/animation.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/engines/sword2/animation.h b/engines/sword2/animation.h index 1f5fced03b..3ef8dac754 100644 --- a/engines/sword2/animation.h +++ b/engines/sword2/animation.h @@ -26,7 +26,6 @@ #define SWORD2_ANIMATION_H #include "video/dxa_decoder.h" -#include "video/smk_decoder.h" #include "video/video_decoder.h" #include "audio/mixer.h" @@ -36,7 +35,8 @@ namespace Sword2 { enum DecoderType { kVideoDecoderDXA = 0, - kVideoDecoderSMK = 1 + kVideoDecoderSMK = 1, + kVideoDecoderPSX = 2 }; struct MovieText { @@ -93,18 +93,19 @@ protected: uint32 _leadOut; int _leadOutFrame; - void performPostProcessing(byte *screen, uint16 pitch); + void performPostProcessing(Graphics::Surface *screen, uint16 pitch); bool playVideo(); + void drawFramePSX(const Graphics::Surface *frame); void openTextObject(uint32 index); - void closeTextObject(uint32 index, byte *screen, uint16 pitch); - void drawTextObject(uint32 index, byte *screen, uint16 pitch); + void closeTextObject(uint32 index, Graphics::Surface *screen, uint16 pitch); + void drawTextObject(uint32 index, Graphics::Surface *screen, uint16 pitch); - byte findBlackPalIndex(); - byte findWhitePalIndex(); + uint32 getBlackColor(); + uint32 getWhiteColor(); }; -MoviePlayer *makeMoviePlayer(const char *name, Sword2Engine *vm, Audio::Mixer *snd, OSystem *system); +MoviePlayer *makeMoviePlayer(const char *name, Sword2Engine *vm, Audio::Mixer *snd, OSystem *system, uint32 frameCount); } // End of namespace Sword2 |