diff options
| author | Vicent Marti | 2008-06-14 14:44:29 +0000 |
|---|---|---|
| committer | Vicent Marti | 2008-06-14 14:44:29 +0000 |
| commit | d0b27cf9c66b9281899acf826cb205e19dcb7260 (patch) | |
| tree | 74e813b1d1f081f35f41ca7a95da5d048951b9e7 /engines/gob/videoplayer.h | |
| parent | d51a0cab3fe494698f001d81d5d86cea7cd0395b (diff) | |
| parent | 91d3ea31359950b59ee46af8355cc0f5790257e5 (diff) | |
| download | scummvm-rg350-d0b27cf9c66b9281899acf826cb205e19dcb7260.tar.gz scummvm-rg350-d0b27cf9c66b9281899acf826cb205e19dcb7260.tar.bz2 scummvm-rg350-d0b27cf9c66b9281899acf826cb205e19dcb7260.zip | |
Merged trunk into the GUI branch.
Fixed MSVS9 project files.
svn-id: r32702
Diffstat (limited to 'engines/gob/videoplayer.h')
| -rw-r--r-- | engines/gob/videoplayer.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/engines/gob/videoplayer.h b/engines/gob/videoplayer.h index fd3c68aa1a..b7aa7313b0 100644 --- a/engines/gob/videoplayer.h +++ b/engines/gob/videoplayer.h @@ -68,6 +68,7 @@ public: uint16 left, uint16 top, uint16 width, uint16 height, uint16 x, uint16 y, uint16 pitch, int16 transp = -1); void slotCopyPalette(int slot, int16 palStart = -1, int16 palEnd = -1); + void slotWaitEndFrame(int slot, bool onlySound = false); bool slotIsOpen(int slot) const; @@ -82,6 +83,8 @@ public: void writeVideoInfo(const char *videoFile, int16 varX, int16 varY, int16 varFrames, int16 varWidth, int16 varHeight); + void notifyPaused(uint32 duration); + private: class Video { public: @@ -127,10 +130,13 @@ private: const Video *getVideoBySlot(int slot = -1) const; + int getNextFreeSlot(); + void copyPalette(CoktelVideo &video, int16 palStart = -1, int16 palEnd = -1); bool doPlay(int16 frame, int16 breakKey, uint16 palCmd, int16 palStart, int16 palEnd, int16 palFrame, int16 endFrame); + void evalBgShading(CoktelVideo &video); }; } // End of namespace Gob |