diff options
| author | Matthew Hoops | 2010-05-23 18:33:55 +0000 |
|---|---|---|
| committer | Matthew Hoops | 2010-05-23 18:33:55 +0000 |
| commit | 2f31b05651baf87ea07bc00cced798955a5fa6be (patch) | |
| tree | eedade6bd746422fe45e8c48c76d1dd667a45b20 /engines/mohawk/graphics.h | |
| parent | e2a388e2f59f689cd89995013236e90a1b004264 (diff) | |
| download | scummvm-rg350-2f31b05651baf87ea07bc00cced798955a5fa6be.tar.gz scummvm-rg350-2f31b05651baf87ea07bc00cced798955a5fa6be.tar.bz2 scummvm-rg350-2f31b05651baf87ea07bc00cced798955a5fa6be.zip | |
Move Mohawk's QuickTime code to graphics/ (and QDM2 to sound, disabled when Mohawk is not enabled) so SCI can use the code.
svn-id: r49165
Diffstat (limited to 'engines/mohawk/graphics.h')
| -rw-r--r-- | engines/mohawk/graphics.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/mohawk/graphics.h b/engines/mohawk/graphics.h index 8d28e1ff4b..23b1ace347 100644 --- a/engines/mohawk/graphics.h +++ b/engines/mohawk/graphics.h @@ -27,11 +27,11 @@ #define MOHAWK_GRAPHICS_H #include "mohawk/bitmap.h" -#include "mohawk/jpeg.h" #include "mohawk/livingbooks.h" #include "mohawk/myst_pict.h" #include "common/file.h" +#include "graphics/video/codecs/mjpeg.h" namespace Mohawk { @@ -96,8 +96,8 @@ public: void loadExternalPictureFile(uint16 stack); void copyImageSectionToScreen(uint16 image, Common::Rect src, Common::Rect dest); void copyImageToScreen(uint16 image, Common::Rect dest); - void showCursor(void); - void hideCursor(void); + void showCursor(); + void hideCursor(); void changeCursor(uint16); void drawRect(Common::Rect rect, bool active); @@ -105,7 +105,7 @@ private: MohawkEngine_Myst *_vm; MystBitmap *_bmpDecoder; MystPICT *_pictDecoder; - JPEGDecoder *_jpegDecoder; + Graphics::JPEGDecoder *_jpegDecoder; Graphics::PixelFormat _pixelFormat; struct PictureFile { |