diff options
author | dhewg | 2011-03-21 22:50:21 +0100 |
---|---|---|
committer | dhewg | 2011-03-22 21:02:08 +0100 |
commit | bb12acfa0ffc0c1fe0a907e6b63c3dd0c2acaec5 (patch) | |
tree | 2be8978e43edfdcf4ba8b88a11094c6ea655f7af /audio/mpu401.h | |
parent | 2053936959f6d079c927866da8936cf5dcc7edde (diff) | |
download | scummvm-rg350-bb12acfa0ffc0c1fe0a907e6b63c3dd0c2acaec5.tar.gz scummvm-rg350-bb12acfa0ffc0c1fe0a907e6b63c3dd0c2acaec5.tar.bz2 scummvm-rg350-bb12acfa0ffc0c1fe0a907e6b63c3dd0c2acaec5.zip |
AUDIO: Cleanup
Is it just me or is overwriting-but-not-marking-as-virtual
irritating?
Diffstat (limited to 'audio/mpu401.h')
-rw-r--r-- | audio/mpu401.h | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/audio/mpu401.h b/audio/mpu401.h index 070eaf636a..07e2817381 100644 --- a/audio/mpu401.h +++ b/audio/mpu401.h @@ -46,22 +46,22 @@ private: public: MidiDriver *device(); byte getNumber() { return _channel; } - void release() { _allocated = false; } + virtual void release() { _allocated = false; } - void send(uint32 b); + virtual void send(uint32 b); // Regular messages - void noteOff(byte note); - void noteOn(byte note, byte velocity); - void programChange(byte program); - void pitchBend(int16 bend); + virtual void noteOff(byte note); + virtual void noteOn(byte note, byte velocity); + virtual void programChange(byte program); + virtual void pitchBend(int16 bend); // Control Change messages - void controlChange(byte control, byte value); - void pitchBendFactor(byte value); + virtual void controlChange(byte control, byte value); + virtual void pitchBendFactor(byte value); // SysEx messages - void sysEx_customInstrument(uint32 type, const byte *instr); + virtual void sysEx_customInstrument(uint32 type, const byte *instr); // Only to be called by the owner void init(MidiDriver *owner, byte channel); @@ -78,14 +78,15 @@ private: public: MidiDriver_MPU401(); + virtual ~MidiDriver_MPU401(); virtual void close(); - void setTimerCallback(void *timer_param, Common::TimerManager::TimerProc timer_proc); - uint32 getBaseTempo(void) { return 10000; } - uint32 property(int prop, uint32 param); + virtual void setTimerCallback(void *timer_param, Common::TimerManager::TimerProc timer_proc); + virtual uint32 getBaseTempo(void) { return 10000; } + virtual uint32 property(int prop, uint32 param); - MidiChannel *allocateChannel(); - MidiChannel *getPercussionChannel() { return &_midi_channels[9]; } + virtual MidiChannel *allocateChannel(); + virtual MidiChannel *getPercussionChannel() { return &_midi_channels[9]; } }; |