diff options
author | Jamieson Christian | 2003-05-17 14:27:58 +0000 |
---|---|---|
committer | Jamieson Christian | 2003-05-17 14:27:58 +0000 |
commit | e880007175532658c4e6a3c18509982d94de1c75 (patch) | |
tree | 1a64050f6b4ed9e468e4ae1d0943769b43213f7b /sound | |
parent | 66cbaa1df73087ac40e4cfb9f3cc89e2ee19119e (diff) | |
download | scummvm-rg350-e880007175532658c4e6a3c18509982d94de1c75.tar.gz scummvm-rg350-e880007175532658c4e6a3c18509982d94de1c75.tar.bz2 scummvm-rg350-e880007175532658c4e6a3c18509982d94de1c75.zip |
Absorbed last tidbits of mididrv.cpp into other files
svn-id: r7606
Diffstat (limited to 'sound')
-rw-r--r-- | sound/mididrv.h | 2 | ||||
-rw-r--r-- | sound/mpu401.cpp | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/sound/mididrv.h b/sound/mididrv.h index 58eac956a6..fe921df0a4 100644 --- a/sound/mididrv.h +++ b/sound/mididrv.h @@ -56,7 +56,7 @@ public: 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); diff --git a/sound/mpu401.cpp b/sound/mpu401.cpp index 3aab56e05d..995895d82d 100644 --- a/sound/mpu401.cpp +++ b/sound/mpu401.cpp @@ -62,6 +62,20 @@ void MidiChannel_MPU401::sysEx_customInstrument(uint32 type, byte *instr) { _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; |