thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

KYRA: Make pointers to VQAHeader const

Browse source 
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.
This commit is contained in:
Torbjörn Andersson 2014-01-18 03:18:40 +01:00 • committed by Johannes Schickel
parent 16d36224e2
commit 18ef3ed6b3
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
engines/kyra/vqa.cpp
View file

@ -282,7 +282,7 @@ void VQADecoder::readNextPacket() {
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
VQADecoder::VQAAudioTrack::VQAAudioTrack(VQAHeader *header) { VQADecoder::VQAAudioTrack::VQAAudioTrack(const VQAHeader *header) {
_audioStream = Audio::makeQueuingAudioStream(header->freq, false); _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)); memset(_palette, 0, sizeof(_palette));
_dirtyPalette = false; _dirtyPalette = false;

4
engines/kyra/vqa.h
View file

@ -80,7 +80,7 @@ private:
class VQAAudioTrack : public AudioTrack { class VQAAudioTrack : public AudioTrack {
public: public:
VQAAudioTrack(VQAHeader *header); VQAAudioTrack(const VQAHeader *header);
~VQAAudioTrack(); ~VQAAudioTrack();
void handleSND0(Common::SeekableReadStream *stream); void handleSND0(Common::SeekableReadStream *stream);
@ -96,7 +96,7 @@ private:
class VQAVideoTrack : public FixedRateVideoTrack { class VQAVideoTrack : public FixedRateVideoTrack {
public: public:
VQAVideoTrack(VQAHeader *header); VQAVideoTrack(const VQAHeader *header);
~VQAVideoTrack(); ~VQAVideoTrack();
uint16 getWidth() const; uint16 getWidth() const;