From 8afe81169146d40e6f23fcea1a518e9a2c0e9ce3 Mon Sep 17 00:00:00 2001 From: Sasha Szpakowski Date: Sun, 1 Mar 2026 00:25:44 -0400 Subject: [PATCH] use the C++ override keyword with love.audio's methods --- src/modules/audio/null/Audio.h | 74 +++++++++++++++---------------- src/modules/audio/openal/Audio.h | 76 ++++++++++++++++---------------- 2 files changed, 75 insertions(+), 75 deletions(-) diff --git a/src/modules/audio/null/Audio.h b/src/modules/audio/null/Audio.h index 600b4a294..706f75e22 100644 --- a/src/modules/audio/null/Audio.h +++ b/src/modules/audio/null/Audio.h @@ -42,56 +42,56 @@ public: virtual ~Audio(); // Implements Audio. - love::audio::Source *newSource(love::sound::Decoder *decoder); - love::audio::Source *newSource(love::sound::SoundData *soundData); - love::audio::Source *newSource(int sampleRate, int bitDepth, int channels, int buffers); - int getActiveSourceCount() const; - int getMaxSources() const; - bool play(love::audio::Source *source); - bool play(const std::vector &sources); - void stop(love::audio::Source *source); - void stop(const std::vector &sources); - void stop(); - void pause(love::audio::Source *source); - void pause(const std::vector &sources); - std::vector pause(); - void setVolume(float volume); - float getVolume() const; + love::audio::Source *newSource(love::sound::Decoder *decoder) override; + love::audio::Source *newSource(love::sound::SoundData *soundData) override; + love::audio::Source *newSource(int sampleRate, int bitDepth, int channels, int buffers) override; + int getActiveSourceCount() const override; + int getMaxSources() const override; + bool play(love::audio::Source *source) override; + bool play(const std::vector &sources) override; + void stop(love::audio::Source *source) override; + void stop(const std::vector &sources) override; + void stop() override; + void pause(love::audio::Source *source) override; + void pause(const std::vector &sources) override; + std::vector pause() override; + void setVolume(float volume) override; + float getVolume() const override; - void getPosition(float *v) const; - void setPosition(float *v); - void getOrientation(float *v) const; - void setOrientation(float *v); - void getVelocity(float *v) const; - void setVelocity(float *v); + void getPosition(float *v) const override; + void setPosition(float *v) override; + void getOrientation(float *v) const override; + void setOrientation(float *v) override; + void getVelocity(float *v) const override; + void setVelocity(float *v) override; - void setDopplerScale(float scale); - float getDopplerScale() const; + void setDopplerScale(float scale) override; + float getDopplerScale() const override; //void setMeter(float scale); //float getMeter() const; - const std::vector &getRecordingDevices(); + const std::vector &getRecordingDevices() override; - DistanceModel getDistanceModel() const; - void setDistanceModel(DistanceModel distanceModel); + DistanceModel getDistanceModel() const override; + void setDistanceModel(DistanceModel distanceModel) override; - bool setEffect(const char *, std::map ¶ms); - bool unsetEffect(const char *); - bool getEffect(const char *, std::map ¶ms); - bool getActiveEffects(std::vector &list) const; - int getMaxSceneEffects() const; - int getMaxSourceEffects() const; - bool isEFXsupported() const; + bool setEffect(const char *, std::map ¶ms) override; + bool unsetEffect(const char *) override; + bool getEffect(const char *, std::map ¶ms) override; + bool getActiveEffects(std::vector &list) const override; + int getMaxSceneEffects() const override; + int getMaxSourceEffects() const override; + bool isEFXsupported() const override; bool setOutputSpatialization(bool enable, const char *filter = nullptr) override; bool getOutputSpatialization(const char *&filter) const override; void getOutputSpatializationFilters(std::vector &list) const override; - void pauseContext(); - void resumeContext(); + void pauseContext() override; + void resumeContext() override; - std::string getPlaybackDevice(); - void getPlaybackDevices(std::vector &list); + std::string getPlaybackDevice() override; + void getPlaybackDevices(std::vector &list) override; private: float volume; diff --git a/src/modules/audio/openal/Audio.h b/src/modules/audio/openal/Audio.h index bce4f7030..990bbcf5c 100644 --- a/src/modules/audio/openal/Audio.h +++ b/src/modules/audio/openal/Audio.h @@ -79,48 +79,48 @@ public: static ALenum getFormat(int bitDepth, int channels); // Implements Audio. - love::audio::Source *newSource(love::sound::Decoder *decoder); - love::audio::Source *newSource(love::sound::SoundData *soundData); - love::audio::Source *newSource(int sampleRate, int bitDepth, int channels, int buffers); - int getActiveSourceCount() const; - int getMaxSources() const; - bool play(love::audio::Source *source); - bool play(const std::vector &sources); - void stop(love::audio::Source *source); - void stop(const std::vector &sources); - void stop(); - void pause(love::audio::Source *source); - void pause(const std::vector &sources); - std::vector pause(); - void pauseContext(); - void resumeContext(); - void setVolume(float volume); - float getVolume() const; + love::audio::Source *newSource(love::sound::Decoder *decoder) override; + love::audio::Source *newSource(love::sound::SoundData *soundData) override; + love::audio::Source *newSource(int sampleRate, int bitDepth, int channels, int buffers) override; + int getActiveSourceCount() const override; + int getMaxSources() const override; + bool play(love::audio::Source *source) override; + bool play(const std::vector &sources) override; + void stop(love::audio::Source *source) override; + void stop(const std::vector &sources) override; + void stop() override; + void pause(love::audio::Source *source) override; + void pause(const std::vector &sources) override; + std::vector pause() override; + void pauseContext() override; + void resumeContext() override; + void setVolume(float volume) override; + float getVolume() const override; - void getPosition(float *v) const; - void setPosition(float *v); - void getOrientation(float *v) const; - void setOrientation(float *v); - void getVelocity(float *v) const; - void setVelocity(float *v); + void getPosition(float *v) const override; + void setPosition(float *v) override; + void getOrientation(float *v) const override; + void setOrientation(float *v) override; + void getVelocity(float *v) const override; + void setVelocity(float *v) override; - void setDopplerScale(float scale); - float getDopplerScale() const; + void setDopplerScale(float scale) override; + float getDopplerScale() const override; //void setMeter(float scale); //float getMeter() const; - const std::vector &getRecordingDevices(); + const std::vector &getRecordingDevices() override; - DistanceModel getDistanceModel() const; - void setDistanceModel(DistanceModel distanceModel); + DistanceModel getDistanceModel() const override; + void setDistanceModel(DistanceModel distanceModel) override; - bool setEffect(const char *name, std::map ¶ms); - bool unsetEffect(const char *name); - bool getEffect(const char *name, std::map ¶ms); - bool getActiveEffects(std::vector &list) const; - int getMaxSceneEffects() const; - int getMaxSourceEffects() const; - bool isEFXsupported() const; + bool setEffect(const char *name, std::map ¶ms) override; + bool unsetEffect(const char *name) override; + bool getEffect(const char *name, std::map ¶ms) override; + bool getActiveEffects(std::vector &list) const override; + int getMaxSceneEffects() const override; + int getMaxSourceEffects() const override; + bool isEFXsupported() const override; bool setOutputSpatialization(bool enable, const char *filter = nullptr) override; bool getOutputSpatialization(const char *&filter) const override; @@ -128,9 +128,9 @@ public: bool getEffectID(const char *name, ALuint &id); - std::string getPlaybackDevice(); - void getPlaybackDevices(std::vector &list); - void setPlaybackDevice(const char *name); + std::string getPlaybackDevice() override; + void getPlaybackDevices(std::vector &list) override; + void setPlaybackDevice(const char *name) override; private: