ILLUSIONS: DUCKMAN: Implement MIDI music fading

scummvm · May 25, 2018 · 056b303 · 056b303
1 parent 9abaa9e
commit 056b303
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 3 deletions.
diff --git a/engines/illusions/duckman/scriptopcodes_duckman.cpp b/engines/illusions/duckman/scriptopcodes_duckman.cpp
@@ -259,7 +259,7 @@ void ScriptOpcodes_Duckman::opUnloadResourcesBySceneId(ScriptThread *scriptThrea
 
 //static uint dsceneId = 0, dthreadId = 0;
 //static uint dsceneId = 0x00010008, dthreadId = 0x00020029;//Beginning in Jac
-static uint dsceneId = 0x0001000A, dthreadId = 0x00020043;//Home front
+// static uint dsceneId = 0x0001000A, dthreadId = 0x00020043;//Home front
 //static uint dsceneId = 0x0001000E, dthreadId = 0x0002007C;
 //static uint dsceneId = 0x00010012, dthreadId = 0x0002009D;//Paramount
 //static uint dsceneId = 0x00010020, dthreadId = 0x00020112;//Xmas
@@ -277,6 +277,7 @@ static uint dsceneId = 0x0001000A, dthreadId = 0x00020043;//Home front
 //static uint dsceneId = 0x10044, dthreadId = 0x000202B8; // Starship Enterprise
 //static uint dsceneId = 0x00010039, dthreadId = 0x00020089; // Map
 // static uint dsceneId = 0x00010052, dthreadId = 0x00020347; // Credits
+static uint dsceneId = 0x0001004B, dthreadId = 0x0002029B;
 
 void ScriptOpcodes_Duckman::opChangeScene(ScriptThread *scriptThread, OpCall &opCall) {
 	ARG_SKIP(2);
@@ -633,7 +634,7 @@ void ScriptOpcodes_Duckman::opStopMidiMusic(ScriptThread *scriptThread, OpCall &
 void ScriptOpcodes_Duckman::opFadeMidiMusic(ScriptThread *scriptThread, OpCall &opCall) {
 	ARG_INT16(duration);
 	ARG_INT16(finalVolume);
-	// TODO _vm->fadeMidiMusic(2, finalVolume, duration, opCall._threadId);
+	_vm->_soundMan->fadeMidiMusic(finalVolume, duration, opCall._threadId);
 }
 
 void ScriptOpcodes_Duckman::opAddMenuChoice(ScriptThread *scriptThread, OpCall &opCall) {

diff --git a/engines/illusions/sound.cpp b/engines/illusions/sound.cpp
@@ -22,6 +22,7 @@
 
 #include "illusions/illusions.h"
 #include "illusions/sound.h"
+#include "illusions/time.h"
 #include "audio/mididrv.h"
 #include "audio/midiparser.h"
 
@@ -383,6 +384,15 @@ void SoundMan::stopMidiMusic() {
 	_midiPlayer->stop();
 }
 
+void SoundMan::fadeMidiMusic(int16 finalVolume, int16 duration, uint32 notifyThreadId) {
+	_midiMusicFader._active = true;
+	_midiMusicFader._notifyThreadId = notifyThreadId;
+	_midiMusicFader._startVolume = _midiMusicFader._currVolume;
+	_midiMusicFader._finalVolume = finalVolume;
+	_midiMusicFader._startTime = getCurrentTime();
+	_midiMusicFader._duration = duration;
+}
+
 void SoundMan::clearMidiMusicQueue() {
 	_midiMusicQueue.clear();
 }
@@ -465,7 +475,26 @@ void SoundMan::updateMidi() {
 		_midiMusicQueue.remove_at(0);
 		_midiPlayer->play(musicId);
 	}
-	// TODO Update music volume fading
+	updateMidiMusicFader();
+}
+
+void SoundMan::updateMidiMusicFader() {
+	if (_midiMusicFader._active) {
+		int16 currTime = getCurrentTime();
+		if (currTime - _midiMusicFader._startTime > _midiMusicFader._duration) {
+			_midiMusicFader._active = false;
+			currTime = _midiMusicFader._startTime + _midiMusicFader._duration;
+			if (_midiMusicFader._notifyThreadId) {
+				_vm->notifyThreadId(_midiMusicFader._notifyThreadId);
+				_midiMusicFader._notifyThreadId = 0;
+			}
+		}
+		const int16 elapsedTime = currTime - _midiMusicFader._startTime;
+		const int16 volumeDelta = _midiMusicFader._finalVolume - _midiMusicFader._startVolume;
+		const int masterMusicVolume = _vm->_mixer->getVolumeForSoundType(Audio::Mixer::kMusicSoundType);
+		_midiMusicFader._currVolume = _midiMusicFader._startVolume + (elapsedTime * volumeDelta / _midiMusicFader._duration);
+		_midiPlayer->setVolume(_midiMusicFader._currVolume * masterMusicVolume / 255);
+	}
 }
 
 } // End of namespace Illusions
diff --git a/engines/illusions/sound.h b/engines/illusions/sound.h
@@ -112,6 +112,18 @@ class Sound {
 	bool _looping;
 };
 
+struct MidiMusicFader {
+	bool _active;
+	uint _flags;
+	int16 _currVolume;
+	int16 _startVolume;
+	int16 _finalVolume;
+	int16 _startTime;
+	int16 _duration;
+	uint32 _notifyThreadId;
+	MidiMusicFader() : _active(false), _currVolume(255) {}
+};
+
 class SoundMan {
 public:
 	SoundMan(IllusionsEngine *vm);
@@ -123,6 +135,7 @@ class SoundMan {
 
 	void playMidiMusic(uint32 musicId);
 	void stopMidiMusic();
+	void fadeMidiMusic(int16 finalVolume, int16 duration, uint32 notifyThreadId);
 	void clearMidiMusicQueue();
 
 	bool cueVoice(const char *voiceName);
@@ -150,8 +163,10 @@ class SoundMan {
 	VoicePlayer *_voicePlayer;
 	SoundList _sounds;
 	Common::Array<uint32> _midiMusicQueue;
+	MidiMusicFader _midiMusicFader;
 	Sound *getSound(uint32 soundEffectId);
 	void updateMidi();
+	void updateMidiMusicFader();
 };
 
 } // End of namespace Illusions