VIDEO: Rewrite SmackerDecoder to use the new API

3 files changed, 25 insertions, 26 deletions

diff --git a/engines/toon/movie.cpp b/engines/toon/movie.cpp
index 93e41adf57..d988a3ed60 100644
--- a/engines/toon/movie.cpp
+++ b/engines/toon/movie.cpp
@@ -33,6 +33,10 @@
 
 namespace Toon {
 
+ToonstruckSmackerDecoder::ToonstruckSmackerDecoder() : Video::SmackerDecoder() {
+	_lowRes = false;
+}
+
 void ToonstruckSmackerDecoder::handleAudioTrack(byte track, uint32 chunkSize, uint32 unpackedSize) {
 	debugC(6, kDebugMovie, "handleAudioTrack(%d, %d, %d)", track, chunkSize, unpackedSize);
 
@@ -40,33 +44,21 @@ void ToonstruckSmackerDecoder::handleAudioTrack(byte track, uint32 chunkSize, ui
 		/* uint16 width = */ _fileStream->readUint16LE();
 		uint16 height = _fileStream->readUint16LE();
 		_lowRes = (height == getHeight() / 2);
-	} else
+	} else {
 		Video::SmackerDecoder::handleAudioTrack(track, chunkSize, unpackedSize);
+	}
 }
 
-bool ToonstruckSmackerDecoder::loadFile(const Common::String &filename) {
-	debugC(1, kDebugMovie, "loadFile(%s)", filename.c_str());
+bool ToonstruckSmackerDecoder::loadStream(Common::SeekableReadStream *stream) {
+	if (!Video::SmackerDecoder::loadStream(stream))
+		return false;
 
 	_lowRes = false;
-
-	if (Video::SmackerDecoder::loadFile(filename)) {
-		if (_surface->h == 200) {
-			if (_surface) {
-				_surface->free();
-				delete _surface;
-			}
-			_surface = new Graphics::Surface();
-			_surface->create(640, 400, Graphics::PixelFormat::createFormatCLUT8());
-			_header.flags = 4;
-		}
-
-		return true;
-	}
-	return false;
+	return true;
 }
 
-ToonstruckSmackerDecoder::ToonstruckSmackerDecoder(Audio::Mixer *mixer, Audio::Mixer::SoundType soundType) : Video::SmackerDecoder(mixer, soundType) {
-	_lowRes = false;
+Video::SmackerDecoder::SmackerVideoTrack *ToonstruckSmackerDecoder::createVideoTrack(uint32 width, uint32 height, uint32 frameCount, const Common::Rational &frameRate, uint32 flags, uint32 signature) const {
+	return Video::SmackerDecoder::createVideoTrack(width, height, frameCount, frameRate, (height == 200) ? 4 : flags, signature);
 }
 
 // decoder is deallocated with Movie destruction i.e. new ToonstruckSmackerDecoder is needed
@@ -103,6 +95,9 @@ void Movie::play(const Common::String &video, int32 flags) {
 
 bool Movie::playVideo(bool isFirstIntroVideo) {
 	debugC(1, kDebugMovie, "playVideo(isFirstIntroVideo: %d)", isFirstIntroVideo);
+
+	_decoder->start();
+
 	while (!_vm->shouldQuit() && !_decoder->endOfVideo()) {
 		if (_decoder->needsUpdate()) {
 			const Graphics::Surface *frame = _decoder->decodeNextFrame();
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 {
diff --git a/engines/toon/toon.cpp b/engines/toon/toon.cpp
index ee427652d8..9fd8415676 100644
--- a/engines/toon/toon.cpp
+++ b/engines/toon/toon.cpp
@@ -51,7 +51,7 @@ void ToonEngine::init() {
 	_currentScriptRegion = 0;
 	_resources = new Resources(this);
 	_animationManager = new AnimationManager(this);
-	_moviePlayer = new Movie(this, new ToonstruckSmackerDecoder(_mixer));
+	_moviePlayer = new Movie(this, new ToonstruckSmackerDecoder());
 	_hotspots = new Hotspots(this);
 
 	_mainSurface = new Graphics::Surface();