diff options
| author | Max Horn | 2008-09-13 22:41:30 +0000 |
|---|---|---|
| committer | Max Horn | 2008-09-13 22:41:30 +0000 |
| commit | f8ccd2dedeeb8fa240cb91afc383441612ddd542 (patch) | |
| tree | 56b45354bcd8f1e0981fc9d126c2a0230008d410 /engines/scumm/smush/imuse_channel.cpp | |
| parent | 15d16b94a722533375b5dba1105d7d2be7db62bb (diff) | |
| download | scummvm-rg350-f8ccd2dedeeb8fa240cb91afc383441612ddd542.tar.gz scummvm-rg350-f8ccd2dedeeb8fa240cb91afc383441612ddd542.tar.bz2 scummvm-rg350-f8ccd2dedeeb8fa240cb91afc383441612ddd542.zip | |
SCUMM: Got rid of class Chunk
svn-id: r34518
Diffstat (limited to 'engines/scumm/smush/imuse_channel.cpp')
| -rw-r--r-- | engines/scumm/smush/imuse_channel.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/engines/scumm/smush/imuse_channel.cpp b/engines/scumm/smush/imuse_channel.cpp index a02e0654c2..fd34a8f60d 100644 --- a/engines/scumm/smush/imuse_channel.cpp +++ b/engines/scumm/smush/imuse_channel.cpp @@ -29,7 +29,6 @@ #include "scumm/scumm.h" // For DEBUG_SMUSH #include "scumm/util.h" #include "scumm/smush/channel.h" -#include "scumm/smush/chunk.h" namespace Scumm { @@ -60,10 +59,10 @@ bool ImuseChannel::checkParameters(int32 index, int32 nbframes, int32 size, int3 return true; } -bool ImuseChannel::appendData(Chunk &b, int32 size) { +bool ImuseChannel::appendData(Common::SeekableReadStream &b, int32 size) { if (_dataSize == -1) { assert(size > 8); - Chunk::type imus_type = b.readUint32BE(); + uint32 imus_type = b.readUint32BE(); /*uint32 imus_size =*/ b.readUint32BE(); if (imus_type != MKID_BE('iMUS')) error("Invalid Chunk for imuse_channel"); @@ -197,7 +196,7 @@ void ImuseChannel::decode() { bool ImuseChannel::handleSubTags(int32 &offset) { if (_tbufferSize - offset >= 8) { - Chunk::type type = READ_BE_UINT32(_tbuffer + offset); + uint32 type = READ_BE_UINT32(_tbuffer + offset); uint32 size = READ_BE_UINT32(_tbuffer + offset + 4); uint32 available_size = _tbufferSize - offset; switch (type) { |