[Scummvm-git-logs] scummvm master -> c42816cd8bef19a69a9983104565aa9105f83e60

[lephilousophe]

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

Summary:
611f8a4049 AUDIO: Make MixerImpl function declarations use the override keyword
c42816cd8b TESTBED: Don't use keyboard as it's more complex for handhelds


Commit: 611f8a40495749c6d3ec283ee063c817d2fc18a1
    https://github.com/scummvm/scummvm/commit/611f8a40495749c6d3ec283ee063c817d2fc18a1
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2026-01-18T19:36:04+01:00

Commit Message:
AUDIO: Make MixerImpl function declarations use the override keyword

Changed paths:
    audio/mixer_intern.h


diff --git a/audio/mixer_intern.h b/audio/mixer_intern.h
index f365af0f175..fea60437a33 100644
--- a/audio/mixer_intern.h
+++ b/audio/mixer_intern.h
@@ -85,60 +85,60 @@ public:
 	MixerImpl(uint sampleRate, bool stereo = true, uint outBufSize = 0);
 	~MixerImpl();
 
-	virtual bool isReady() const { Common::StackLock lock(_mutex); return _mixerReady; }
+	bool isReady() const override { Common::StackLock lock(_mutex); return _mixerReady; }
 
-	virtual Common::Mutex &mutex() { return _mutex; }
+	Common::Mutex &mutex() override { return _mutex; }
 
-	virtual void playStream(
+	void playStream(
 		SoundType type,
 		SoundHandle *handle,
 		AudioStream *input,
 		int id, byte volume, int8 balance,
 		DisposeAfterUse::Flag autofreeStream,
 		bool permanent,
-		bool reverseStereo);
+		bool reverseStereo) override;
 
-	virtual void stopAll();
-	virtual void stopID(int id);
-	virtual void stopHandle(SoundHandle handle);
+	void stopAll() override;
+	void stopID(int id) override;
+	void stopHandle(SoundHandle handle) override;
 
-	virtual void pauseAll(bool paused);
-	virtual void pauseID(int id, bool paused);
-	virtual void pauseHandle(SoundHandle handle, bool paused);
+	void pauseAll(bool paused) override;
+	void pauseID(int id, bool paused) override;
+	void pauseHandle(SoundHandle handle, bool paused) override;
 
-	virtual bool isSoundIDActive(int id);
-	virtual int getSoundID(SoundHandle handle);
+	bool isSoundIDActive(int id) override;
+	int getSoundID(SoundHandle handle) override;
 
-	virtual bool isSoundHandleActive(SoundHandle handle);
+	bool isSoundHandleActive(SoundHandle handle) override;
 
-	virtual void muteSoundType(SoundType type, bool mute);
-	virtual bool isSoundTypeMuted(SoundType type) const;
+	void muteSoundType(SoundType type, bool mute) override;
+	bool isSoundTypeMuted(SoundType type) const override;
 
-	virtual void setChannelVolume(SoundHandle handle, byte volume);
-	virtual byte getChannelVolume(SoundHandle handle);
-	virtual void setChannelBalance(SoundHandle handle, int8 balance);
-	virtual int8 getChannelBalance(SoundHandle handle);
-	virtual void setChannelFaderL(SoundHandle handle, uint8 scaleL);
-	virtual uint8 getChannelFaderL(SoundHandle handle);
-	virtual void setChannelFaderR(SoundHandle handle, uint8 scaleR);
-	virtual uint8 getChannelFaderR(SoundHandle handle);
-	virtual void setChannelRate(SoundHandle handle, uint32 rate);
-	virtual uint32 getChannelRate(SoundHandle handle);
-	virtual void resetChannelRate(SoundHandle handle);
+	void setChannelVolume(SoundHandle handle, byte volume) override;
+	byte getChannelVolume(SoundHandle handle) override;
+	void setChannelBalance(SoundHandle handle, int8 balance) override;
+	int8 getChannelBalance(SoundHandle handle) override;
+	void setChannelFaderL(SoundHandle handle, uint8 scaleL) override;
+	uint8 getChannelFaderL(SoundHandle handle) override;
+	void setChannelFaderR(SoundHandle handle, uint8 scaleR) override;
+	uint8 getChannelFaderR(SoundHandle handle) override;
+	void setChannelRate(SoundHandle handle, uint32 rate) override;
+	uint32 getChannelRate(SoundHandle handle) override;
+	void resetChannelRate(SoundHandle handle) override;
 
-	virtual uint32 getSoundElapsedTime(SoundHandle handle);
-	virtual Timestamp getElapsedTime(SoundHandle handle);
+	uint32 getSoundElapsedTime(SoundHandle handle) override;
+	Timestamp getElapsedTime(SoundHandle handle) override;
 
-	virtual void loopChannel(SoundHandle handle);
+	void loopChannel(SoundHandle handle) override;
 
-	virtual bool hasActiveChannelOfType(SoundType type);
+	bool hasActiveChannelOfType(SoundType type) override;
 
-	virtual void setVolumeForSoundType(SoundType type, int volume);
-	virtual int getVolumeForSoundType(SoundType type) const;
+	void setVolumeForSoundType(SoundType type, int volume) override;
+	int getVolumeForSoundType(SoundType type) const override;
 
-	virtual uint getOutputRate() const;
-	virtual bool getOutputStereo() const;
-	virtual uint getOutputBufSize() const;
+	uint getOutputRate() const override;
+	bool getOutputStereo() const override;
+	uint getOutputBufSize() const override;
 
 protected:
 	void insertChannel(SoundHandle *handle, Channel *chan);


Commit: c42816cd8bef19a69a9983104565aa9105f83e60
    https://github.com/scummvm/scummvm/commit/c42816cd8bef19a69a9983104565aa9105f83e60
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2026-01-18T19:36:27+01:00

Commit Message:
TESTBED: Don't use keyboard as it's more complex for handhelds

Changed paths:
    engines/testbed/sound.cpp


diff --git a/engines/testbed/sound.cpp b/engines/testbed/sound.cpp
index fb69bafce06..7daa7e1b9da 100644
--- a/engines/testbed/sound.cpp
+++ b/engines/testbed/sound.cpp
@@ -29,6 +29,7 @@
 #include "common/events.h"
 #include "common/file.h"
 
+#include "testbed/testbed.h"
 #include "testbed/sound.h"
 
 namespace Testbed {
@@ -236,13 +237,20 @@ TestExitStatus SoundSubsystem::modPlayback() {
 		while (mixer->isSoundHandleActive(handle)) {
 			g_system->delayMillis(10);
 			Testsuite::writeOnScreen(Common::String::format("Playing Now: %s", music[i]), pt);
-			Testsuite::writeOnScreen("Press 'S' to stop", pt2);
+			Testsuite::writeOnScreen("Click to stop.", pt2);
 
 			if (eventMan->pollEvent(event)) {
-				if (event.type == Common::EVENT_KEYDOWN && event.kbd.keycode == Common::KEYCODE_s)
+				// Quit if explicitly requested!
+				if (Engine::shouldQuit()) {
+					break;
+				}
+				if (event.type == Common::EVENT_LBUTTONDOWN || event.type == Common::EVENT_RBUTTONDOWN)
 					break;
 			}
 		}
+		if (Engine::shouldQuit()) {
+			break;
+		}
 		g_system->delayMillis(10);
 
 		mixer->stopAll();