diff options
| author | Matthew Hoops | 2010-12-16 01:35:13 +0000 |
|---|---|---|
| committer | Matthew Hoops | 2010-12-16 01:35:13 +0000 |
| commit | 375f32fbe94e8500a03c19ed32865efdcde8ca8e (patch) | |
| tree | 3544a3da06401aea4192a7557294b61734e4d1ef /engines/sci | |
| parent | a2bb676c19c70cd79f141650fe0587148c71702b (diff) | |
| download | scummvm-rg350-375f32fbe94e8500a03c19ed32865efdcde8ca8e.tar.gz scummvm-rg350-375f32fbe94e8500a03c19ed32865efdcde8ca8e.tar.bz2 scummvm-rg350-375f32fbe94e8500a03c19ed32865efdcde8ca8e.zip | |
VIDEO: Make VideoDecoder::decodeNextFrame() return a const Surface pointer
svn-id: r54927
Diffstat (limited to 'engines/sci')
| -rw-r--r-- | engines/sci/engine/kvideo.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/video/seq_decoder.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/video/seq_decoder.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/engines/sci/engine/kvideo.cpp b/engines/sci/engine/kvideo.cpp index 9245572bbf..b4c3c3bddf 100644 --- a/engines/sci/engine/kvideo.cpp +++ b/engines/sci/engine/kvideo.cpp @@ -67,7 +67,7 @@ void playVideo(Graphics::VideoDecoder *videoDecoder) { while (!g_engine->shouldQuit() && !videoDecoder->endOfVideo() && !skipVideo) { if (videoDecoder->needsUpdate()) { - Graphics::Surface *frame = videoDecoder->decodeNextFrame(); + const Graphics::Surface *frame = videoDecoder->decodeNextFrame(); if (frame) { if (scaleBuffer) { // TODO: Probably should do aspect ratio correction in e.g. GK1 Windows diff --git a/engines/sci/video/seq_decoder.cpp b/engines/sci/video/seq_decoder.cpp index a08f837866..3f4bd458b8 100644 --- a/engines/sci/video/seq_decoder.cpp +++ b/engines/sci/video/seq_decoder.cpp @@ -108,7 +108,7 @@ void SeqDecoder::close() { reset(); } -Graphics::Surface *SeqDecoder::decodeNextFrame() { +const Graphics::Surface *SeqDecoder::decodeNextFrame() { int16 frameWidth = _fileStream->readUint16LE(); int16 frameHeight = _fileStream->readUint16LE(); int16 frameLeft = _fileStream->readUint16LE(); diff --git a/engines/sci/video/seq_decoder.h b/engines/sci/video/seq_decoder.h index 1714477083..4d94d145ce 100644 --- a/engines/sci/video/seq_decoder.h +++ b/engines/sci/video/seq_decoder.h @@ -47,7 +47,7 @@ public: uint16 getWidth() const { return SEQ_SCREEN_WIDTH; } uint16 getHeight() const { return SEQ_SCREEN_HEIGHT; } uint32 getFrameCount() const { return _frameCount; } - Graphics::Surface *decodeNextFrame(); + const Graphics::Surface *decodeNextFrame(); Graphics::PixelFormat getPixelFormat() const { return Graphics::PixelFormat::createFormatCLUT8(); } byte *getPalette() { _dirtyPalette = false; return _palette; } bool hasDirtyPalette() const { return _dirtyPalette; } |