SysEx data now passed around with const pointers. Permits simplification of some SysEx client code.

Testing on Windows. Developers on other platforms, please verify integrity of music handling in your respective MidiDrivers.

svn-id: r20952

4 files changed, 10 insertions, 10 deletions

diff --git a/engines/scumm/imuse/imuse_internal.h b/engines/scumm/imuse/imuse_internal.h
index 3640cafa64..45e1b89a4a 100644
--- a/engines/scumm/imuse/imuse_internal.h
+++ b/engines/scumm/imuse/imuse_internal.h
@@ -265,7 +265,7 @@ public:
 	void close() { }
 	void send(uint32 b);
 	const char *getErrorName(int error_code) { return "Unknown"; }
-	void sysEx(byte *msg, uint16 length);
+	void sysEx(const byte *msg, uint16 length);
 	void metaEvent(byte type, byte *data, uint16 length);
 	void setTimerCallback(void *timer_param, void(*timer_proc)(void *)) { }
 	uint32 getBaseTempo();
diff --git a/engines/scumm/imuse/imuse_player.cpp b/engines/scumm/imuse/imuse_player.cpp
index b73eb2a3bf..540be1a2f9 100644
--- a/engines/scumm/imuse/imuse_player.cpp
+++ b/engines/scumm/imuse/imuse_player.cpp
@@ -343,7 +343,7 @@ void Player::send(uint32 b) {
 	return;
 }
 
-void Player::sysEx(byte *p, uint16 len) {
+void Player::sysEx(const byte *p, uint16 len) {
 	byte code;
 	byte a;
 	uint b;
diff --git a/engines/scumm/imuse/instrument.cpp b/engines/scumm/imuse/instrument.cpp
index 16d89c5ed2..4af3ef096b 100644
--- a/engines/scumm/imuse/instrument.cpp
+++ b/engines/scumm/imuse/instrument.cpp
@@ -164,7 +164,7 @@ private:
 	} _instrument;
 
 public:
-	Instrument_Adlib (byte *data);
+	Instrument_Adlib (const byte *data);
 	Instrument_Adlib (Serializer *s);
 	void saveOrLoad (Serializer *s);
 	void send (MidiChannel *mc);
@@ -239,7 +239,7 @@ private:
 	uint8 getEquivalentGM();
 
 public:
-	Instrument_Roland (byte *data);
+	Instrument_Roland (const byte *data);
 	Instrument_Roland (Serializer *s);
 	void saveOrLoad (Serializer *s);
 	void send (MidiChannel *mc);
@@ -272,7 +272,7 @@ void Instrument::program (byte prog, bool mt32) {
 	_instrument = new Instrument_Program (prog, mt32);
 }
 
-void Instrument::adlib (byte *instrument) {
+void Instrument::adlib (const byte *instrument) {
 	clear();
 	if (!instrument)
 		return;
@@ -280,7 +280,7 @@ void Instrument::adlib (byte *instrument) {
 	_instrument = new Instrument_Adlib (instrument);
 }
 
-void Instrument::roland (byte *instrument) {
+void Instrument::roland (const byte *instrument) {
 	clear();
 	if (!instrument)
 		return;
@@ -361,7 +361,7 @@ void Instrument_Program::send (MidiChannel *mc) {
 //
 ////////////////////////////////////////
 
-Instrument_Adlib::Instrument_Adlib (byte *data) {
+Instrument_Adlib::Instrument_Adlib (const byte *data) {
 	memcpy (&_instrument, data, sizeof (_instrument));
 }
 
@@ -389,7 +389,7 @@ void Instrument_Adlib::send (MidiChannel *mc) {
 //
 ////////////////////////////////////////
 
-Instrument_Roland::Instrument_Roland (byte *data) {
+Instrument_Roland::Instrument_Roland (const byte *data) {
 	memcpy (&_instrument, data, sizeof (_instrument));
 	memcpy (&_instrument_name, &_instrument.common.name, sizeof (_instrument.common.name));
 	_instrument_name[10] = '\0';
diff --git a/engines/scumm/imuse/instrument.h b/engines/scumm/imuse/instrument.h
index eb1a30a1d1..49d8b00880 100644
--- a/engines/scumm/imuse/instrument.h
+++ b/engines/scumm/imuse/instrument.h
@@ -65,8 +65,8 @@ public:
 	void copy_to (Instrument *dest) { if (_instrument) _instrument->copy_to (dest); else dest->clear(); }
 
 	void program (byte program, bool mt32);
-	void adlib (byte *instrument);
-	void roland (byte *instrument);
+	void adlib (const byte *instrument);
+	void roland (const byte *instrument);
 
 	byte getType() { return _type; }
 	bool isValid() { return (_instrument ? _instrument->is_valid() : false); }