diff options
Diffstat (limited to 'engines/bladerunner/vqa_decoder.h')
| -rw-r--r-- | engines/bladerunner/vqa_decoder.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/bladerunner/vqa_decoder.h b/engines/bladerunner/vqa_decoder.h index 8ab6be5c7e..fdc5b53d19 100644 --- a/engines/bladerunner/vqa_decoder.h +++ b/engines/bladerunner/vqa_decoder.h @@ -54,14 +54,14 @@ enum VQADecoderSkipFlags { class VQADecoder { public: - VQADecoder(Graphics::Surface *surface); + VQADecoder(); ~VQADecoder(); bool loadStream(Common::SeekableReadStream *s); void readFrame(int frame, uint readFlags = kVQAReadAll); - void decodeVideoFrame(int frame, bool forceDraw = false); + void decodeVideoFrame(Graphics::Surface *surface, int frame, bool forceDraw = false); void decodeZBuffer(ZBuffer *zbuffer); Audio::SeekableAudioStream *decodeAudioFrame(); void decodeView(View *view); @@ -139,7 +139,7 @@ private: class VQAAudioTrack; Common::SeekableReadStream *_s; - Graphics::Surface *_surface; + // Graphics::Surface *_surface; Header _header; int _readingFrame; @@ -172,7 +172,7 @@ private: class VQAVideoTrack { public: - VQAVideoTrack(VQADecoder *vqaDecoder, Graphics::Surface *surface); + VQAVideoTrack(VQADecoder *vqaDecoder); ~VQAVideoTrack(); uint16 getWidth() const; @@ -180,7 +180,7 @@ private: int getFrameCount() const; - void decodeVideoFrame(bool forceDraw); + void decodeVideoFrame(Graphics::Surface *surface, bool forceDraw); void decodeZBuffer(ZBuffer *zbuffer); void decodeView(View *view); void decodeScreenEffects(ScreenEffects *aesc); @@ -202,7 +202,7 @@ private: private: VQADecoder *_vqaDecoder; - Graphics::Surface *_surface; + bool _hasNewFrame; uint16 _numFrames; @@ -233,8 +233,8 @@ private: uint8 *_screenEffectsData; uint32 _screenEffectsDataSize; - void VPTRWriteBlock(uint16 *frame, unsigned int dstBlock, unsigned int srcBlock, int count, bool alpha = false); - bool decodeFrame(uint16 *frame); + void VPTRWriteBlock(Graphics::Surface *surface, unsigned int dstBlock, unsigned int srcBlock, int count, bool alpha = false); + bool decodeFrame(Graphics::Surface *surface); }; class VQAAudioTrack { |