From 18ef3ed6b357bbe3ea35989b19ecac32fdf07892 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torbj=C3=B6rn=20Andersson?= Date: Sat, 18 Jan 2014 03:18:40 +0100 Subject: [PATCH] KYRA: Make pointers to VQAHeader const This is just to enforce the idea that VQADecoder owns the VQAHeader and that the audio/video tracks are only allowed to look at it, not change it. --- engines/kyra/vqa.cpp | 4 ++-- engines/kyra/vqa.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/engines/kyra/vqa.cpp b/engines/kyra/vqa.cpp index ab106d40f868..40da6f131c22 100644 --- a/engines/kyra/vqa.cpp +++ b/engines/kyra/vqa.cpp @@ -282,7 +282,7 @@ void VQADecoder::readNextPacket() { // ----------------------------------------------------------------------- -VQADecoder::VQAAudioTrack::VQAAudioTrack(VQAHeader *header) { +VQADecoder::VQAAudioTrack::VQAAudioTrack(const VQAHeader *header) { _audioStream = Audio::makeQueuingAudioStream(header->freq, false); } @@ -395,7 +395,7 @@ void VQADecoder::VQAAudioTrack::handleSND2(Common::SeekableReadStream *stream) { // ----------------------------------------------------------------------- -VQADecoder::VQAVideoTrack::VQAVideoTrack(VQAHeader *header) { +VQADecoder::VQAVideoTrack::VQAVideoTrack(const VQAHeader *header) { memset(_palette, 0, sizeof(_palette)); _dirtyPalette = false; diff --git a/engines/kyra/vqa.h b/engines/kyra/vqa.h index 02414819db8f..f3890107a807 100644 --- a/engines/kyra/vqa.h +++ b/engines/kyra/vqa.h @@ -80,7 +80,7 @@ class VQADecoder : public Video::VideoDecoder { class VQAAudioTrack : public AudioTrack { public: - VQAAudioTrack(VQAHeader *header); + VQAAudioTrack(const VQAHeader *header); ~VQAAudioTrack(); void handleSND0(Common::SeekableReadStream *stream); @@ -96,7 +96,7 @@ class VQADecoder : public Video::VideoDecoder { class VQAVideoTrack : public FixedRateVideoTrack { public: - VQAVideoTrack(VQAHeader *header); + VQAVideoTrack(const VQAHeader *header); ~VQAVideoTrack(); uint16 getWidth() const;