[Scummvm-git-logs] scummvm master -> 2a511602565f60f07cf0cc64ce97e38ef33689fb

[mduggan]

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

Summary:
391df1dcf1 ULTIMA: NUVIE: Silence compiler warnings by fixing overrides
2a51160256 ULTIMA: NUVIE: Fully stop music when it's finished


Commit: 391df1dcf184efbea7a91e52b8b5b762f559e6b0
    https://github.com/scummvm/scummvm/commit/391df1dcf184efbea7a91e52b8b5b762f559e6b0
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2023-11-12T17:27:42+11:00

Commit Message:
ULTIMA: NUVIE: Silence compiler warnings by fixing overrides

Changed paths:
    engines/ultima/nuvie/sound/song.h
    engines/ultima/nuvie/sound/song_adplug.cpp
    engines/ultima/nuvie/sound/song_adplug.h
    engines/ultima/nuvie/sound/song_filename.h


diff --git a/engines/ultima/nuvie/sound/song.h b/engines/ultima/nuvie/sound/song.h
index ad9bc92f31b..15e852cb6bf 100644
--- a/engines/ultima/nuvie/sound/song.h
+++ b/engines/ultima/nuvie/sound/song.h
@@ -30,10 +30,10 @@ namespace Nuvie {
 class Song : public Sound {
 public:
 
-	virtual bool Init(const char *filename) {
+	virtual bool Init(const char *filename, const char *fileId) {
 		return false;
 	}
-	virtual bool Init(const char *path, const char *fileId) {
+	virtual bool Init(const char *path, const char *fileId, uint16 songnum) {
 		return false;
 	}
 	bool Play(bool looping = false) override {
diff --git a/engines/ultima/nuvie/sound/song_adplug.cpp b/engines/ultima/nuvie/sound/song_adplug.cpp
index 7c95005aaab..eb055e41b35 100644
--- a/engines/ultima/nuvie/sound/song_adplug.cpp
+++ b/engines/ultima/nuvie/sound/song_adplug.cpp
@@ -41,7 +41,7 @@ SongAdPlug::SongAdPlug(Audio::Mixer *m, CEmuopl *o) {
 SongAdPlug::~SongAdPlug() {
 }
 
-bool SongAdPlug::Init(const char *filename, uint16 song_num) {
+bool SongAdPlug::Init(const char *filename, const char *fileId, uint16 song_num) {
 	if (filename == NULL)
 		return false;
 
diff --git a/engines/ultima/nuvie/sound/song_adplug.h b/engines/ultima/nuvie/sound/song_adplug.h
index 8b36442c3e0..2a82b9c3a8b 100644
--- a/engines/ultima/nuvie/sound/song_adplug.h
+++ b/engines/ultima/nuvie/sound/song_adplug.h
@@ -37,10 +37,10 @@ public:
 
 	SongAdPlug(Audio::Mixer *m, CEmuopl *o);
 	~SongAdPlug() override;
-	bool Init(const char *filename) override {
-		return Init(filename, 0);
+	bool Init(const char *filename, const char *fileId) override {
+		return Init(filename, fileId, 0);
 	}
-	bool Init(const char *filename, uint16 song_num);
+	bool Init(const char *filename, const char *fileId, uint16 song_num) override;
 	bool Play(bool looping = false) override;
 	bool Stop() override;
 	bool SetVolume(uint8 volume) override;
diff --git a/engines/ultima/nuvie/sound/song_filename.h b/engines/ultima/nuvie/sound/song_filename.h
index 5fe5ba5318a..687bb1196e4 100644
--- a/engines/ultima/nuvie/sound/song_filename.h
+++ b/engines/ultima/nuvie/sound/song_filename.h
@@ -30,8 +30,8 @@ namespace Nuvie {
 class SongFilename : public Song {
 public:
 	~SongFilename() override;
-	bool Init(const char *path, const char *fileId);
-	bool Init(const char *path, const char *fileId, uint16 song_num);
+	bool Init(const char *path, const char *fileId) override;
+	bool Init(const char *path, const char *fileId, uint16 song_num) override;
 	bool Play(bool looping = false) override;
 	bool Stop() override;
 	bool SetVolume(uint8 volume) override;


Commit: 2a511602565f60f07cf0cc64ce97e38ef33689fb
    https://github.com/scummvm/scummvm/commit/2a511602565f60f07cf0cc64ce97e38ef33689fb
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2023-11-12T17:30:42+11:00

Commit Message:
ULTIMA: NUVIE: Fully stop music when it's finished

Changed paths:
    engines/ultima/nuvie/sound/sound_manager.cpp


diff --git a/engines/ultima/nuvie/sound/sound_manager.cpp b/engines/ultima/nuvie/sound/sound_manager.cpp
index d3e496840ee..8d19b341363 100644
--- a/engines/ultima/nuvie/sound/sound_manager.cpp
+++ b/engines/ultima/nuvie/sound/sound_manager.cpp
@@ -768,7 +768,7 @@ void SoundManager::update() {
 	if (music_enabled && audio_enabled && g_MusicFinished) {
 		Common::StackLock lock(_musicMutex);
 
-		musicPause();
+		musicStop();
 		musicPlay();
 	}
 }