[Scummvm-git-logs] scummvm master -> 9f843b2f6ce0dc1698cd541988b8a560d5ad54e8

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
9f843b2f6c AGOS: Added support for Enhanced Soundtrack


Commit: 9f843b2f6ce0dc1698cd541988b8a560d5ad54e8
    https://github.com/scummvm/scummvm/commit/9f843b2f6ce0dc1698cd541988b8a560d5ad54e8
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-05-27T20:23:34+02:00

Commit Message:
AGOS: Added support for Enhanced Soundtrack

Changed paths:
    engines/agos/agos.h
    engines/agos/res_snd.cpp


diff --git a/engines/agos/agos.h b/engines/agos/agos.h
index 6c3a154dc20..23144e5d530 100644
--- a/engines/agos/agos.h
+++ b/engines/agos/agos.h
@@ -60,6 +60,10 @@ struct Surface;
 class FontSJIS;
 }
 
+namespace Audio {
+class SeekableAudioStream;
+}
+
 namespace AGOS {
 
 enum {
@@ -586,6 +590,8 @@ protected:
 	int _vgaTickCounter;
 
 	Audio::SoundHandle _modHandle;
+	Audio::SoundHandle _digitalMusicHandle;
+	Audio::SeekableAudioStream *_digitalMusicStream = nullptr;
 
 	Sound *_sound;
 
diff --git a/engines/agos/res_snd.cpp b/engines/agos/res_snd.cpp
index a7e91b02c34..00cce8a07b4 100644
--- a/engines/agos/res_snd.cpp
+++ b/engines/agos/res_snd.cpp
@@ -251,6 +251,18 @@ void AGOSEngine_Simon2::playMusic(uint16 music, uint16 track) {
 		loadMusic(10, !track10Fix && track > 0, track10Fix || track > 0);
 	}
 
+#ifdef USE_VORBIS
+		Common::String trackName = Common::String::format("OGG/track%02d", _lastMusicPlayed);
+
+		_digitalMusicStream = Audio::SeekableAudioStream::openStreamFile(trackName.c_str());
+		if (_digitalMusicStream) {
+			_mixer->playStream(Audio::Mixer::kMusicSoundType, &_digitalMusicHandle, _digitalMusicStream);
+
+			debug(1, "AGOSEngine_Simon2::playMusic(): Playing %s", trackName.c_str());
+
+			return;
+		}
+#endif
 	_midi->play(track);
 }
 
@@ -313,7 +325,7 @@ void AGOSEngine_Simon1::playMusic(uint16 music, uint16 track) {
 		_midi->play();
 	} else if (getPlatform() == Common::kPlatformAcorn) {
 		// Acorn floppy version.
-		
+
 		// TODO: Add support for Desktop Tracker format in Acorn disk version
 	}
 }
@@ -393,6 +405,7 @@ void AGOSEngine::stopMusic() {
 		_midi->stop();
 	}
 	_mixer->stopHandle(_modHandle);
+	_mixer->stopHandle(_digitalMusicHandle);
 }
 
 static const byte elvira1_soundTable[100] = {