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

[sev-]

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:
80e772ad3b SCUMM: Add missing override keyword
cb406dd95b SCUMM: Comment out unused class variable


Commit: 80e772ad3b206ff399aae89b755ec32fa1b398ce
    https://github.com/scummvm/scummvm/commit/80e772ad3b206ff399aae89b755ec32fa1b398ce
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-10-10T00:22:40+02:00

Commit Message:
SCUMM: Add missing override keyword

Changed paths:
    engines/scumm/imuse/drivers/midi.cpp


diff --git a/engines/scumm/imuse/drivers/midi.cpp b/engines/scumm/imuse/drivers/midi.cpp
index 1f3a93383e0..ccb98228ee4 100644
--- a/engines/scumm/imuse/drivers/midi.cpp
+++ b/engines/scumm/imuse/drivers/midi.cpp
@@ -207,7 +207,7 @@ void IMuseChannel_Midi::noteOn(byte note, byte velocity)  {
 #else
 	if (_newSystem)
 		noteOnIntern(note, velocity);
-	else 
+	else
 		sendMidi(0x90, note, velocity);
 #endif
 }
@@ -403,7 +403,7 @@ int IMuseDriver_GMidi::open() {
 	if (_gsMode)
 		initDeviceAsRolandGS();
 	else
-		initDevice();	
+		initDevice();
 
 	return res;
 }
@@ -663,7 +663,7 @@ public:
 	void setOutput(ChannelNode *out) override { _out = out; }
 
 private:
-	bool validateTransmission(byte note) const { return _program < 128 && (!_newSystem || !(_number == 9 && note > 75)); }
+	bool validateTransmission(byte note) const override { return _program < 128 && (!_newSystem || !(_number == 9 && note > 75)); }
 
 	void sendMidi(byte stat, byte par1, byte par2) override {
 		if (_drv && (_out || _number == 9))


Commit: cb406dd95bdd2f053191b05be3efbfa51c2cdd30
    https://github.com/scummvm/scummvm/commit/cb406dd95bdd2f053191b05be3efbfa51c2cdd30
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-10-10T00:22:57+02:00

Commit Message:
SCUMM: Comment out unused class variable

Changed paths:
    engines/scumm/imuse/drivers/pcspk.cpp
    engines/scumm/imuse/drivers/pcspk.h


diff --git a/engines/scumm/imuse/drivers/pcspk.cpp b/engines/scumm/imuse/drivers/pcspk.cpp
index 0854253c94a..459c6514968 100644
--- a/engines/scumm/imuse/drivers/pcspk.cpp
+++ b/engines/scumm/imuse/drivers/pcspk.cpp
@@ -172,7 +172,7 @@ void IMuseDriver_PCSpk::output(uint16 out) {
 }
 
 IMuseDriver_PCSpk::MidiChannel_PcSpk::MidiChannel_PcSpk(IMuseDriver_PCSpk *owner, byte number) : MidiChannel(), _owner(owner), _number(number), _allocated(false),
-	_priority(0), _tl(0), _modWheel(0), _pitchBend(0), _programNr(0), _sustain(0), _pitchBendFactor(2), _pitchBendTmp(0), _transpose(0), _detune(0) {
+	_priority(0), _tl(0), _modWheel(0), _pitchBend(0), /*_programNr(0), */_sustain(0), _pitchBendFactor(2), _pitchBendTmp(0), _transpose(0), _detune(0) {
 	memset(&_out, 0, sizeof(_out));
 	memset(_instrument, 0, sizeof(_instrument));
 }
diff --git a/engines/scumm/imuse/drivers/pcspk.h b/engines/scumm/imuse/drivers/pcspk.h
index 5ffe2d6915c..64590a244cc 100644
--- a/engines/scumm/imuse/drivers/pcspk.h
+++ b/engines/scumm/imuse/drivers/pcspk.h
@@ -134,7 +134,7 @@ private:
 	private:
 		IMuseDriver_PCSpk *_owner;
 		const byte _number;
-		uint8 _programNr;
+		//uint8 _programNr;
 		uint8 _sustain;
 		uint8 _pitchBendFactor;
 		int16 _pitchBendTmp;