[Scummvm-git-logs] scummvm master -> 4c45f9f39f3aa0bfee70fc81b7d0938de12dfdf0

athrxx athrxx at scummvm.org
Wed Jul 17 17:28:44 CEST 2019


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

Summary:
7478cffd88 SCUMM: (iMUSE/Amiga) - cleanup
4c6ff7843f SCUMM: remove unused declarations
4c45f9f39f SCUMM: (iMUSE/Amiga) - fix INDY4 instruments handling


Commit: 7478cffd882213f101f4b5aa73f9d02a1c3e2c83
    https://github.com/scummvm/scummvm/commit/7478cffd882213f101f4b5aa73f9d02a1c3e2c83
Author: athrxx (athrxx at scummvm.org)
Date: 2019-07-17T17:26:51+02:00

Commit Message:
SCUMM: (iMUSE/Amiga) - cleanup

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


diff --git a/engines/scumm/imuse/drivers/amiga.cpp b/engines/scumm/imuse/drivers/amiga.cpp
index 4942fd5..c119e14 100644
--- a/engines/scumm/imuse/drivers/amiga.cpp
+++ b/engines/scumm/imuse/drivers/amiga.cpp
@@ -85,7 +85,6 @@ private:
 
 	uint8 _id;
 	uint8 _note;
-	int8 _transpose;
 	bool _sustain;
 
 	IMuseDriver_Amiga *_driver;
@@ -309,7 +308,6 @@ void SoundChannel_Amiga::ctrl_sustain(bool sustainToggle) {
 }
 
 void SoundChannel_Amiga::transposePitchBend(int8 transpose, int16 pitchBend) {
-	//_transpose = transpose;
 	const Instrument_Amiga::Samples *s = &_instruments[_ioUnit.program].samples[_ioUnit.block];
 	_driver->setChannelPeriod(_id, calculatePeriod(((_note + transpose) << 7) + pitchBend, s->baseNote, s->rate));
 }


Commit: 4c6ff7843f12c5d791ca5ddda789e77216669e69
    https://github.com/scummvm/scummvm/commit/4c6ff7843f12c5d791ca5ddda789e77216669e69
Author: athrxx (athrxx at scummvm.org)
Date: 2019-07-17T17:26:52+02:00

Commit Message:
SCUMM: remove unused declarations

(several function declarations in imuse_internal.h)

Changed paths:
    engines/scumm/imuse/imuse_internal.h


diff --git a/engines/scumm/imuse/imuse_internal.h b/engines/scumm/imuse/imuse_internal.h
index 4b9b750..72c020f 100644
--- a/engines/scumm/imuse/imuse_internal.h
+++ b/engines/scumm/imuse/imuse_internal.h
@@ -219,9 +219,7 @@ protected:
 	// Player part
 	void hook_clear();
 	void uninit_parts();
-	byte *parse_midi(byte *s);
 	void part_set_transpose(uint8 chan, byte relative, int8 b);
-	void parse_sysex(byte *p, uint len);
 	void maybe_jump(byte cmd, uint track, uint beat, uint tick);
 	void maybe_set_transpose(byte *data);
 	void maybe_part_onoff(byte *data);
@@ -240,7 +238,6 @@ protected:
 	// Sequencer part
 	int start_seq_sound(int sound, bool reset_vars = true);
 	void loadStartParameters(int sound);
-	int query_param(int param);
 
 public:
 	IMuseInternal *_se;
@@ -352,7 +349,6 @@ struct Part : public Common::Serializable {
 	void off();
 	void set_instrument(uint b);
 	void set_instrument(byte *data);
-	void set_instrument_pcspk(byte *data);
 	void load_global_instrument(byte b);
 
 	void set_transpose(int8 transpose);
@@ -503,7 +499,6 @@ protected:
 	int set_volchan_entry(uint a, uint b);
 	int set_channel_volume(uint chan, uint vol);
 	void update_volumes();
-	void reset_tick();
 
 	int set_volchan(int sound, int volchan);
 


Commit: 4c45f9f39f3aa0bfee70fc81b7d0938de12dfdf0
    https://github.com/scummvm/scummvm/commit/4c45f9f39f3aa0bfee70fc81b7d0938de12dfdf0
Author: athrxx (athrxx at scummvm.org)
Date: 2019-07-17T17:26:52+02:00

Commit Message:
SCUMM: (iMUSE/Amiga) - fix INDY4 instruments handling

FOA Amiga uses 'ROL ' resources (unlike MI2 which has 'AMI ' resources). So our imuse player treated those as MT32 tracks playing on a non-MT32 device and applied GM mapping. Which of course messed up the instruments.

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


diff --git a/engines/scumm/imuse/imuse.cpp b/engines/scumm/imuse/imuse.cpp
index 37a0465..de59297 100644
--- a/engines/scumm/imuse/imuse.cpp
+++ b/engines/scumm/imuse/imuse.cpp
@@ -158,11 +158,11 @@ bool IMuseInternal::isMT32(int sound) {
 	case MKTAG('S', 'P', 'K', ' '):
 		return false;
 
-	case MKTAG('A', 'M', 'I', ' '): // Amiga
+	case MKTAG('A', 'M', 'I', ' '): // MI2 Amiga
 		return false;
 
-	case MKTAG('R', 'O', 'L', ' '):
-		return true;
+	case MKTAG('R', 'O', 'L', ' '): // Unfortunately FOA Amiga also uses this resource type
+		return !_isAmiga;
 
 	case MKTAG('M', 'A', 'C', ' '): // Occurs in the Mac version of FOA and MI2
 		return false;





More information about the Scummvm-git-logs mailing list