libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-31 07:53:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

AUDIO: Added override keywords

Browse Source
This commit is contained in:
Eugene Sandulenko 2020-03-09 16:08:19 +01:00
parent 464c3ef0bf
commit 4da444f238
10 changed files with 59 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
audio/adlib.cpp
View File

@ -933,21 +933,21 @@ class MidiDriver_ADLIB : public MidiDriver {
public: public:
MidiDriver_ADLIB(); MidiDriver_ADLIB();
int open(); int open() override;
void close(); void close() override;
void send(uint32 b) override; void send(uint32 b) override;
void send(byte channel, uint32 b); // Supports higher than channel 15 void send(byte channel, uint32 b); // Supports higher than channel 15
uint32 property(int prop, uint32 param); uint32 property(int prop, uint32 param) override;
bool isOpen() const { return _isOpen; } bool isOpen() const override { return _isOpen; }
uint32 getBaseTempo() { return 1000000 / OPL::OPL::kDefaultCallbackFrequency; } uint32 getBaseTempo() override { return 1000000 / OPL::OPL::kDefaultCallbackFrequency; }
void setPitchBendRange(byte channel, uint range); void setPitchBendRange(byte channel, uint range) override;
void sysEx_customInstrument(byte channel, uint32 type, const byte *instr); void sysEx_customInstrument(byte channel, uint32 type, const byte *instr) override;
MidiChannel *allocateChannel(); MidiChannel *allocateChannel() override;
MidiChannel *getPercussionChannel() { return &_percussion; } // Percussion partially supported MidiChannel *getPercussionChannel() override { return &_percussion; } // Percussion partially supported
virtual void setTimerCallback(void *timerParam, Common::TimerManager::TimerProc timerProc); virtual void setTimerCallback(void *timerParam, Common::TimerManager::TimerProc timerProc) override;
private: private:
bool _scummSmallHeader; // FIXME: This flag controls a special mode for SCUMM V3 games bool _scummSmallHeader; // FIXME: This flag controls a special mode for SCUMM V3 games

2
audio/midiplayer.h
View File

@ -116,7 +116,7 @@ public:
// MidiDriver_BASE implementation // MidiDriver_BASE implementation
virtual void send(uint32 b) override; virtual void send(uint32 b) override;
virtual void metaEvent(byte type, byte *data, uint16 length); virtual void metaEvent(byte type, byte *data, uint16 length) override;
protected: protected:
/** /**

16
audio/miles_adlib.cpp
View File

@ -121,19 +121,19 @@ public:
virtual ~MidiDriver_Miles_AdLib(); virtual ~MidiDriver_Miles_AdLib();
// MidiDriver // MidiDriver
int open(); int open() override;
void close(); void close() override;
void send(uint32 b) override; void send(uint32 b) override;
MidiChannel *allocateChannel() { return NULL; } MidiChannel *allocateChannel() override { return NULL; }
MidiChannel *getPercussionChannel() { return NULL; } MidiChannel *getPercussionChannel() override { return NULL; }
bool isOpen() const { return _isOpen; } bool isOpen() const override { return _isOpen; }
uint32 getBaseTempo() { return 1000000 / OPL::OPL::kDefaultCallbackFrequency; } uint32 getBaseTempo() override { return 1000000 / OPL::OPL::kDefaultCallbackFrequency; }
void setVolume(byte volume); void setVolume(byte volume);
virtual uint32 property(int prop, uint32 param); virtual uint32 property(int prop, uint32 param) override;
void setTimerCallback(void *timerParam, Common::TimerManager::TimerProc timerProc); void setTimerCallback(void *timerParam, Common::TimerManager::TimerProc timerProc) override;
private: private:
bool _modeOPL3; bool _modeOPL3;

14
audio/miles_mt32.cpp
View File

@ -75,29 +75,29 @@ public:
virtual ~MidiDriver_Miles_MT32(); virtual ~MidiDriver_Miles_MT32();
// MidiDriver // MidiDriver
int open(); int open() override;
void close(); void close() override;
bool isOpen() const { return _isOpen; } bool isOpen() const override { return _isOpen; }
void send(uint32 b) override; void send(uint32 b) override;
MidiChannel *allocateChannel() { MidiChannel *allocateChannel() override {
if (_driver) if (_driver)
return _driver->allocateChannel(); return _driver->allocateChannel();
return NULL; return NULL;
} }
MidiChannel *getPercussionChannel() { MidiChannel *getPercussionChannel() override {
if (_driver) if (_driver)
return _driver->getPercussionChannel(); return _driver->getPercussionChannel();
return NULL; return NULL;
} }
void setTimerCallback(void *timer_param, Common::TimerManager::TimerProc timer_proc) { void setTimerCallback(void *timer_param, Common::TimerManager::TimerProc timer_proc) override {
if (_driver) if (_driver)
_driver->setTimerCallback(timer_param, timer_proc); _driver->setTimerCallback(timer_param, timer_proc);
} }
uint32 getBaseTempo() { uint32 getBaseTempo() override {
if (_driver) { if (_driver) {
return _driver->getBaseTempo(); return _driver->getBaseTempo();
} }

14
audio/softsynth/fluidsynth.cpp
View File

@ -57,21 +57,21 @@ protected:
void setNum(const char *name, double num); void setNum(const char *name, double num);
void setStr(const char *name, const char *str); void setStr(const char *name, const char *str);
void generateSamples(int16 *buf, int len); void generateSamples(int16 *buf, int len) override;
public: public:
MidiDriver_FluidSynth(Audio::Mixer *mixer); MidiDriver_FluidSynth(Audio::Mixer *mixer);
int open(); int open() override;
void close(); void close() override;
void send(uint32 b) override; void send(uint32 b) override;
MidiChannel *allocateChannel(); MidiChannel *allocateChannel() override;
MidiChannel *getPercussionChannel(); MidiChannel *getPercussionChannel() override;
// AudioStream API // AudioStream API
bool isStereo() const { return true; } bool isStereo() const override { return true; }
int getRate() const { return _outputRate; } int getRate() const override { return _outputRate; }
}; };
// MidiDriver method implementations // MidiDriver method implementations

20
audio/softsynth/mt32.cpp
View File

@ -114,25 +114,25 @@ private:
int _outputRate; int _outputRate;
protected: protected:
void generateSamples(int16 *buf, int len); void generateSamples(int16 *buf, int len) override;
public: public:
MidiDriver_MT32(Audio::Mixer *mixer); MidiDriver_MT32(Audio::Mixer *mixer);
virtual ~MidiDriver_MT32(); virtual ~MidiDriver_MT32();
int open(); int open() override;
void close(); void close() override;
void send(uint32 b) override; void send(uint32 b) override;
void setPitchBendRange(byte channel, uint range); void setPitchBendRange(byte channel, uint range) override;
void sysEx(const byte *msg, uint16 length); void sysEx(const byte *msg, uint16 length) override;
uint32 property(int prop, uint32 param); uint32 property(int prop, uint32 param) override;
MidiChannel *allocateChannel(); MidiChannel *allocateChannel() override;
MidiChannel *getPercussionChannel(); MidiChannel *getPercussionChannel() override;
// AudioStream API // AudioStream API
bool isStereo() const { return true; } bool isStereo() const override { return true; }
int getRate() const { return _outputRate; } int getRate() const override { return _outputRate; }
}; };
//////////////////////////////////////// ////////////////////////////////////////

8
backends/midi/coreaudio.cpp
View File

@ -96,11 +96,11 @@ class MidiDriver_CORE : public MidiDriver_MPU401 {
public: public:
MidiDriver_CORE(); MidiDriver_CORE();
~MidiDriver_CORE(); ~MidiDriver_CORE();
int open(); int open() override;
bool isOpen() const { return _auGraph != 0; } bool isOpen() const override { return _auGraph != 0; }
void close(); void close() override;
void send(uint32 b) override; void send(uint32 b) override;
void sysEx(const byte *msg, uint16 length); void sysEx(const byte *msg, uint16 length) override;
private: private:
void loadSoundFont(const char *soundfont); void loadSoundFont(const char *soundfont);

8
backends/midi/coremidi.cpp
View File

@ -55,11 +55,11 @@ class MidiDriver_CoreMIDI : public MidiDriver_MPU401 {
public: public:
MidiDriver_CoreMIDI(ItemCount device); MidiDriver_CoreMIDI(ItemCount device);
~MidiDriver_CoreMIDI(); ~MidiDriver_CoreMIDI();
int open(); int open() override;
bool isOpen() const { return mOutPort != 0 && mDest != 0; } bool isOpen() const override { return mOutPort != 0 && mDest != 0; }
void close(); void close() override;
void send(uint32 b) override; void send(uint32 b) override;
void sysEx(const byte *msg, uint16 length); void sysEx(const byte *msg, uint16 length) override;
private: private:
ItemCount mDevice; ItemCount mDevice;

8
backends/midi/seq.cpp
View File

@ -54,11 +54,11 @@
class MidiDriver_SEQ : public MidiDriver_MPU401 { class MidiDriver_SEQ : public MidiDriver_MPU401 {
public: public:
MidiDriver_SEQ(); MidiDriver_SEQ();
int open(); int open() override;
bool isOpen() const { return _isOpen; } bool isOpen() const override { return _isOpen; }
void close(); void close() override;
void send(uint32 b) override; void send(uint32 b) override;
void sysEx(const byte *msg, uint16 length); void sysEx(const byte *msg, uint16 length) override;
private: private:
bool _isOpen; bool _isOpen;

8
backends/midi/timidity.cpp
View File

@ -84,11 +84,11 @@ class MidiDriver_TIMIDITY : public MidiDriver_MPU401 {
public: public:
MidiDriver_TIMIDITY(); MidiDriver_TIMIDITY();
int open(); int open() override;
bool isOpen() const { return _isOpen; } bool isOpen() const override { return _isOpen; }
void close(); void close() override;
void send(uint32 b) override; void send(uint32 b) override;
void sysEx(const byte *msg, uint16 length); void sysEx(const byte *msg, uint16 length) override;
private: private:
/* creates a tcp connection to TiMidity server, returns filedesc (like open()) */ /* creates a tcp connection to TiMidity server, returns filedesc (like open()) */