VIDEO: Convert DXADecoder to the AdvancedVideoDecoder API

3 files changed, 29 insertions, 65 deletions

diff --git a/engines/sword2/animation.cpp b/engines/sword2/animation.cpp
index e257ec9029..e603925e73 100644
--- a/engines/sword2/animation.cpp
+++ b/engines/sword2/animation.cpp
@@ -40,6 +40,7 @@
 
 #include "gui/message.h"
 
+#include "video/dxa_decoder.h"
 #include "video/smk_decoder.h"
 #include "video/psx_decoder.h"
 
@@ -51,9 +52,8 @@ namespace Sword2 {
 // Basic movie player
 ///////////////////////////////////////////////////////////////////////////////
 
-MoviePlayer::MoviePlayer(Sword2Engine *vm, Audio::Mixer *snd, OSystem *system, Audio::SoundHandle *bgSoundHandle, Video::VideoDecoder *decoder, DecoderType decoderType)
-	: _vm(vm), _snd(snd), _bgSoundHandle(bgSoundHandle), _system(system) {
-	_bgSoundStream = NULL;
+MoviePlayer::MoviePlayer(Sword2Engine *vm, OSystem *system, Video::VideoDecoder *decoder, DecoderType decoderType)
+	: _vm(vm), _system(system) {
 	_decoderType = decoderType;
 	_decoder = decoder;
 
@@ -62,7 +62,6 @@ MoviePlayer::MoviePlayer(Sword2Engine *vm, Audio::Mixer *snd, OSystem *system, A
 }
 
 MoviePlayer::~MoviePlayer() {
-	delete _bgSoundHandle;
 	delete _decoder;
 }
 
@@ -75,11 +74,6 @@ bool MoviePlayer::load(const char *name) {
 	if (_vm->shouldQuit())
 		return false;
 
-	if (_decoderType == kVideoDecoderDXA)
-		_bgSoundStream = Audio::SeekableAudioStream::openStreamFile(name);
-	else
-		_bgSoundStream = NULL;
-
 	_textSurface = NULL;
 
 	Common::String filename;
@@ -89,13 +83,6 @@ bool MoviePlayer::load(const char *name) {
 		break;
 	case kVideoDecoderSMK:
 		filename = Common::String::format("%s.smk", name);
-
-		if (_decoder->loadFile(filename)) {
-			((Video::AdvancedVideoDecoder *)_decoder)->start(); // TODO: Remove after new API is complete
-			return true;
-		} else {
-			return false;
-		}
 		break;
 	case kVideoDecoderPSX:
 		filename = Common::String::format("%s.str", name);
@@ -114,7 +101,15 @@ bool MoviePlayer::load(const char *name) {
 		}
 	}
 
-	return _decoder->loadFile(filename.c_str());
+	if (!_decoder->loadFile(filename))
+		return false;
+
+	// For DXA, also add the external sound file
+	if (_decoderType == kVideoDecoderDXA)
+		((Video::AdvancedVideoDecoder *)_decoder)->addStreamFileTrack(name);
+
+	((Video::AdvancedVideoDecoder *)_decoder)->start(); // TODO: Remove after new API is complete
+	return true;
 }
 
 void MoviePlayer::play(MovieText *movieTexts, uint32 numMovieTexts, uint32 leadIn, uint32 leadOut) {
@@ -130,24 +125,15 @@ void MoviePlayer::play(MovieText *movieTexts, uint32 numMovieTexts, uint32 leadI
 	if (leadIn)
 		_vm->_sound->playMovieSound(leadIn, kLeadInSound);
 
-	if (_bgSoundStream)
-		_snd->playStream(Audio::Mixer::kSFXSoundType, _bgSoundHandle, _bgSoundStream);
-
-	bool terminated = false;
-
-	terminated = !playVideo();
+	bool terminated = !playVideo();
 
 	closeTextObject(_currentMovieText, NULL, 0);
 
 	if (terminated) {
-		_snd->stopHandle(*_bgSoundHandle);
 		_vm->_sound->stopMovieSounds();
 		_vm->_sound->stopSpeech();
 	}
 
-	while (_snd->isSoundHandleActive(*_bgSoundHandle))
-		_system->delayMillis(100);
-
 	if (_decoderType == kVideoDecoderPSX) {
 		// Need to jump back to paletted color
 		initGraphics(640, 480, true);
@@ -414,31 +400,19 @@ void MoviePlayer::drawFramePSX(const Graphics::Surface *frame) {
 	scaledFrame.free();
 }
 
-DXADecoderWithSound::DXADecoderWithSound(Audio::Mixer *mixer, Audio::SoundHandle *bgSoundHandle)
-	: _mixer(mixer), _bgSoundHandle(bgSoundHandle)  {
-}
-
-uint32 DXADecoderWithSound::getTime() const {
-	if (_mixer->isSoundHandleActive(*_bgSoundHandle))
-		return _mixer->getSoundElapsedTime(*_bgSoundHandle);
-
-	return DXADecoder::getTime();
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 // Factory function for creating the appropriate cutscene player
 ///////////////////////////////////////////////////////////////////////////////
 
-MoviePlayer *makeMoviePlayer(const char *name, Sword2Engine *vm, Audio::Mixer *snd, OSystem *system, uint32 frameCount) {
+MoviePlayer *makeMoviePlayer(const char *name, Sword2Engine *vm, OSystem *system, uint32 frameCount) {
 	Common::String filename;
-	Audio::SoundHandle *bgSoundHandle = new Audio::SoundHandle;
 
 	filename = Common::String::format("%s.str", name);
 
 	if (Common::File::exists(filename)) {
 #ifdef USE_RGB_COLOR
 		Video::VideoDecoder *psxDecoder = new Video::PSXStreamDecoder(Video::PSXStreamDecoder::kCD2x, frameCount);
-		return new MoviePlayer(vm, snd, system, bgSoundHandle, psxDecoder, kVideoDecoderPSX);
+		return new MoviePlayer(vm, system, psxDecoder, kVideoDecoderPSX);
 #else
 		GUI::MessageDialog dialog(_("PSX cutscenes found but ScummVM has been built without RGB color support"), _("OK"));
 		dialog.runModal();
@@ -450,15 +424,15 @@ MoviePlayer *makeMoviePlayer(const char *name, Sword2Engine *vm, Audio::Mixer *s
 
 	if (Common::File::exists(filename)) {
 		Video::SmackerDecoder *smkDecoder = new Video::SmackerDecoder();
-		return new MoviePlayer(vm, snd, system, bgSoundHandle, smkDecoder, kVideoDecoderSMK);
+		return new MoviePlayer(vm, system, smkDecoder, kVideoDecoderSMK);
 	}
 
 	filename = Common::String::format("%s.dxa", name);
 
 	if (Common::File::exists(filename)) {
 #ifdef USE_ZLIB
-		DXADecoderWithSound *dxaDecoder = new DXADecoderWithSound(snd, bgSoundHandle);
-		return new MoviePlayer(vm, snd, system, bgSoundHandle, dxaDecoder, kVideoDecoderDXA);
+		Video::DXADecoder *dxaDecoder = new Video::DXADecoder();
+		return new MoviePlayer(vm, system, dxaDecoder, kVideoDecoderDXA);
 #else
 		GUI::MessageDialog dialog(_("DXA cutscenes found but ScummVM has been built without zlib support"), _("OK"));
 		dialog.runModal();
diff --git a/engines/sword2/animation.h b/engines/sword2/animation.h
index 3d5c42b7f7..b2a243b2ca 100644
--- a/engines/sword2/animation.h
+++ b/engines/sword2/animation.h
@@ -25,12 +25,16 @@
 #ifndef SWORD2_ANIMATION_H
 #define SWORD2_ANIMATION_H
 
-#include "video/dxa_decoder.h"
-#include "video/video_decoder.h"
-#include "audio/mixer.h"
-
 #include "sword2/screen.h"
 
+namespace Graphics {
+struct Surface;
+}
+
+namespace Video {
+class VideoDecoder;
+}
+
 namespace Sword2 {
 
 enum DecoderType {
@@ -55,20 +59,9 @@ struct MovieText {
 	}
 };
 
-class DXADecoderWithSound : public Video::DXADecoder {
-public:
-	DXADecoderWithSound(Audio::Mixer *mixer, Audio::SoundHandle *bgSoundHandle);
-	~DXADecoderWithSound() {}
-
-	uint32 getTime() const;
-private:
-	Audio::Mixer *_mixer;
-	Audio::SoundHandle *_bgSoundHandle;
-};
-
 class MoviePlayer {
 public:
-	MoviePlayer(Sword2Engine *vm, Audio::Mixer *snd, OSystem *system, Audio::SoundHandle *bgSoundHandle, Video::VideoDecoder *decoder, DecoderType decoderType);
+	MoviePlayer(Sword2Engine *vm, OSystem *system, Video::VideoDecoder *decoder, DecoderType decoderType);
 	virtual ~MoviePlayer();
 
 	bool load(const char *name);
@@ -76,7 +69,6 @@ public:
 
 protected:
 	Sword2Engine *_vm;
-	Audio::Mixer *_snd;
 	OSystem *_system;
 	MovieText *_movieTexts;
 	uint32 _numMovieTexts;
@@ -87,8 +79,6 @@ protected:
 	DecoderType _decoderType;
 
 	Video::VideoDecoder *_decoder;
-	Audio::SoundHandle *_bgSoundHandle;
-	Audio::AudioStream *_bgSoundStream;
 
 	uint32 _leadOut;
 	int _leadOutFrame;
@@ -105,7 +95,7 @@ protected:
 	uint32 getWhiteColor();
 };
 
-MoviePlayer *makeMoviePlayer(const char *name, Sword2Engine *vm, Audio::Mixer *snd, OSystem *system, uint32 frameCount);
+MoviePlayer *makeMoviePlayer(const char *name, Sword2Engine *vm, OSystem *system, uint32 frameCount);
 
 } // End of namespace Sword2
 
diff --git a/engines/sword2/function.cpp b/engines/sword2/function.cpp
index 836b252d6c..07fcaa094b 100644
--- a/engines/sword2/function.cpp
+++ b/engines/sword2/function.cpp
@@ -2139,7 +2139,7 @@ int32 Logic::fnPlaySequence(int32 *params) {
 
 	uint32 frameCount = Sword2Engine::isPsx() ? params[1] : 0;
 
-	_moviePlayer = makeMoviePlayer(filename, _vm, _vm->_mixer, _vm->_system, frameCount);
+	_moviePlayer = makeMoviePlayer(filename, _vm, _vm->_system, frameCount);
 
 	if (_moviePlayer && _moviePlayer->load(filename)) {
 		_moviePlayer->play(_sequenceTextList, _sequenceTextLines, _smackerLeadIn, _smackerLeadOut);