diff options
| author | Matthew Hoops | 2012-08-26 15:39:18 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2012-08-26 15:41:56 -0400 |
| commit | 857b92f8ffececa9c1f990d21a6a8d1630199a62 (patch) | |
| tree | 420463df7bf481f8c4e0dcba9bd37e68d999b43d /engines/toon/movie.h | |
| parent | 1d58ebe133c274643a89f2f4f0d24a2a8ab343c3 (diff) | |
| parent | 18e7573dafbffdd509943c8f90f91933b17b0435 (diff) | |
| download | scummvm-rg350-857b92f8ffececa9c1f990d21a6a8d1630199a62.tar.gz scummvm-rg350-857b92f8ffececa9c1f990d21a6a8d1630199a62.tar.bz2 scummvm-rg350-857b92f8ffececa9c1f990d21a6a8d1630199a62.zip | |
Merge pull request #268 from clone2727/video-rewrite
VideoDecoder upgrade & partial rewrite
Diffstat (limited to 'engines/toon/movie.h')
| -rw-r--r-- | engines/toon/movie.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/engines/toon/movie.h b/engines/toon/movie.h index 2cd33302f2..e795182cba 100644 --- a/engines/toon/movie.h +++ b/engines/toon/movie.h @@ -30,13 +30,17 @@ namespace Toon { class ToonstruckSmackerDecoder : public Video::SmackerDecoder { public: - ToonstruckSmackerDecoder(Audio::Mixer *mixer, Audio::Mixer::SoundType soundType = Audio::Mixer::kSFXSoundType); - virtual ~ToonstruckSmackerDecoder() {} - void handleAudioTrack(byte track, uint32 chunkSize, uint32 unpackedSize); - bool loadFile(const Common::String &filename); + ToonstruckSmackerDecoder(); + + bool loadStream(Common::SeekableReadStream *stream); bool isLowRes() { return _lowRes; } + protected: - bool _lowRes; + void handleAudioTrack(byte track, uint32 chunkSize, uint32 unpackedSize); + SmackerVideoTrack *createVideoTrack(uint32 width, uint32 height, uint32 frameCount, const Common::Rational &frameRate, uint32 flags, uint32 signature) const; + +private: + bool _lowRes; }; class Movie { |