[Scummvm-cvs-logs] CVS: scummvm/sound mididrv.h,1.18,1.19 mpu401.cpp,1.7,1.8

[Jamieson Christian]

Update of /cvsroot/scummvm/scummvm/sound
In directory sc8-pr-cvs1:/tmp/cvs-serv17075/scummvm/sound

Modified Files:
	mididrv.h mpu401.cpp 
Log Message:
Absorbed last tidbits of mididrv.cpp into other files

Index: mididrv.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mididrv.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- mididrv.h	30 Apr 2003 12:51:06 -0000	1.18
+++ mididrv.h	17 May 2003 14:27:58 -0000	1.19
@@ -56,7 +56,7 @@
 	virtual void send(uint32 b) = 0;
 
 	// Get or set a property
-	virtual uint32 property(int prop, uint32 param);
+	virtual uint32 property(int prop, uint32 param) { return 0; }
 
 	// Retrieve a string representation of an error code
 	static const char *getErrorName(int error_code);

Index: mpu401.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mpu401.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- mpu401.cpp	16 May 2003 21:05:57 -0000	1.7
+++ mpu401.cpp	17 May 2003 14:27:58 -0000	1.8
@@ -62,6 +62,20 @@
 	_owner->sysEx_customInstrument (_channel, type, instr);
 }
 
+const char *MidiDriver::getErrorName(int error_code) {
+	static const char *const midi_errors[] = {
+		"No error",
+		"Cannot connect",
+		"Streaming not available",
+		"Device not available",
+		"Driver already open"
+	};
+
+	if ((uint) error_code >= ARRAYSIZE(midi_errors))
+		return "Unknown Error";
+	return midi_errors[error_code];
+}
+
 MidiDriver_MPU401::MidiDriver_MPU401() : MidiDriver() {
 	uint i;