From f7088f69ab7406ea9fefa853fa7ce11f914e88cf Mon Sep 17 00:00:00 2001 From: Loic Blot Date: Fri, 7 Apr 2017 08:50:17 +0200 Subject: Clang-format: fix some header files and remove them from whitelist --- src/sound.h | 66 +++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 36 insertions(+), 30 deletions(-) (limited to 'src/sound.h') diff --git a/src/sound.h b/src/sound.h index c21401e8b..ba2d629d2 100644 --- a/src/sound.h +++ b/src/sound.h @@ -20,9 +20,9 @@ with this program; if not, write to the Free Software Foundation, Inc., #ifndef SOUND_HEADER #define SOUND_HEADER -#include "irrlichttypes_bloated.h" -#include #include +#include +#include "irrlichttypes_bloated.h" class OnDemandSoundFetcher { @@ -36,61 +36,68 @@ struct SimpleSoundSpec { std::string name; float gain; - SimpleSoundSpec(std::string name="", float gain=1.0): - name(name), - gain(gain) - {} - bool exists() {return name != "";} + SimpleSoundSpec(std::string name = "", float gain = 1.0) : name(name), gain(gain) + { + } + bool exists() { return name != ""; } // Serialization intentionally left out }; class ISoundManager { public: - virtual ~ISoundManager(){} - + virtual ~ISoundManager() {} + // Multiple sounds can be loaded per name; when played, the sound // should be chosen randomly from alternatives // Return value determines success/failure - virtual bool loadSoundFile(const std::string &name, - const std::string &filepath) = 0; - virtual bool loadSoundData(const std::string &name, - const std::string &filedata) = 0; + virtual bool loadSoundFile( + const std::string &name, const std::string &filepath) = 0; + virtual bool loadSoundData( + const std::string &name, const std::string &filedata) = 0; virtual void updateListener(v3f pos, v3f vel, v3f at, v3f up) = 0; virtual void setListenerGain(float gain) = 0; // playSound functions return -1 on failure, otherwise a handle to the // sound. If name=="", call should be ignored without error. - virtual int playSound(const std::string &name, bool loop, - float volume) = 0; - virtual int playSoundAt(const std::string &name, bool loop, - float volume, v3f pos) = 0; + virtual int playSound(const std::string &name, bool loop, float volume) = 0; + virtual int playSoundAt( + const std::string &name, bool loop, float volume, v3f pos) = 0; virtual void stopSound(int sound) = 0; virtual bool soundExists(int sound) = 0; virtual void updateSoundPosition(int sound, v3f pos) = 0; int playSound(const SimpleSoundSpec &spec, bool loop) - { return playSound(spec.name, loop, spec.gain); } + { + return playSound(spec.name, loop, spec.gain); + } int playSoundAt(const SimpleSoundSpec &spec, bool loop, v3f pos) - { return playSoundAt(spec.name, loop, spec.gain, pos); } + { + return playSoundAt(spec.name, loop, spec.gain, pos); + } }; -class DummySoundManager: public ISoundManager +class DummySoundManager : public ISoundManager { public: - virtual bool loadSoundFile(const std::string &name, - const std::string &filepath) {return true;} - virtual bool loadSoundData(const std::string &name, - const std::string &filedata) {return true;} + virtual bool loadSoundFile(const std::string &name, const std::string &filepath) + { + return true; + } + virtual bool loadSoundData(const std::string &name, const std::string &filedata) + { + return true; + } void updateListener(v3f pos, v3f vel, v3f at, v3f up) {} void setListenerGain(float gain) {} - int playSound(const std::string &name, bool loop, - float volume) {return 0;} - int playSoundAt(const std::string &name, bool loop, - float volume, v3f pos) {return 0;} + int playSound(const std::string &name, bool loop, float volume) { return 0; } + int playSoundAt(const std::string &name, bool loop, float volume, v3f pos) + { + return 0; + } void stopSound(int sound) {} - bool soundExists(int sound) {return false;} + bool soundExists(int sound) { return false; } void updateSoundPosition(int sound, v3f pos) {} }; @@ -98,4 +105,3 @@ public: extern DummySoundManager dummySoundManager; #endif - -- cgit v1.2.3 From f98bbe193e0093aca8d8957cec82fdbd28639915 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Blot?= Date: Thu, 20 Apr 2017 00:12:52 +0200 Subject: Fix various copy instead of const ref reported by cppcheck (part 3) (#5616) * Also remove 2 non declared but defined functions * Make some functions around const ref changes const --- src/sound.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src/sound.h') diff --git a/src/sound.h b/src/sound.h index ba2d629d2..d13799eac 100644 --- a/src/sound.h +++ b/src/sound.h @@ -34,13 +34,15 @@ public: struct SimpleSoundSpec { + SimpleSoundSpec(const std::string &name = "", float gain = 1.0) : + name(name), + gain(gain) + {} + + bool exists() const { return name != ""; } + std::string name; float gain; - SimpleSoundSpec(std::string name = "", float gain = 1.0) : name(name), gain(gain) - { - } - bool exists() { return name != ""; } - // Serialization intentionally left out }; class ISoundManager -- cgit v1.2.3 From dc0e9097d3144a3dda81039f666ee43ba29cbc36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Blot?= Date: Fri, 21 Apr 2017 23:40:48 +0200 Subject: Fix various performance issues reported by cppcheck + code style (CI) (#5635) * Make CI happy with code style on master * guiFileSelectMenu: remove useless includes * some performance fixes pointed by cppcheck * remove some useless casts * TextDest: remove unused setFormSpec function --- src/sound.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/sound.h') diff --git a/src/sound.h b/src/sound.h index d13799eac..98f7692d5 100644 --- a/src/sound.h +++ b/src/sound.h @@ -34,10 +34,10 @@ public: struct SimpleSoundSpec { - SimpleSoundSpec(const std::string &name = "", float gain = 1.0) : - name(name), - gain(gain) - {} + SimpleSoundSpec(const std::string &name = "", float gain = 1.0) + : name(name), gain(gain) + { + } bool exists() const { return name != ""; } -- cgit v1.2.3 From bd921a7916f0fafc493b1c4d0eeb5e2bb1d6a7c2 Mon Sep 17 00:00:00 2001 From: Brandon Date: Sun, 10 Jul 2016 00:08:26 -0500 Subject: Sound API: Add fading sounds --- src/sound.h | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) (limited to 'src/sound.h') diff --git a/src/sound.h b/src/sound.h index 98f7692d5..7bdb6a26b 100644 --- a/src/sound.h +++ b/src/sound.h @@ -34,8 +34,8 @@ public: struct SimpleSoundSpec { - SimpleSoundSpec(const std::string &name = "", float gain = 1.0) - : name(name), gain(gain) + SimpleSoundSpec(const std::string &name = "", float gain = 1.0, float fade = 0.0) + : name(name), gain(gain), fade(fade) { } @@ -43,13 +43,13 @@ struct SimpleSoundSpec std::string name; float gain; + float fade; }; class ISoundManager { public: virtual ~ISoundManager() {} - // Multiple sounds can be loaded per name; when played, the sound // should be chosen randomly from alternatives // Return value determines success/failure @@ -63,16 +63,21 @@ public: // playSound functions return -1 on failure, otherwise a handle to the // sound. If name=="", call should be ignored without error. - virtual int playSound(const std::string &name, bool loop, float volume) = 0; - virtual int playSoundAt( - const std::string &name, bool loop, float volume, v3f pos) = 0; + virtual int playSound(const std::string &name, bool loop, float volume, + float fade = 0) = 0; + virtual int playSoundAt(const std::string &name, bool loop, float volume, + v3f pos) = 0; virtual void stopSound(int sound) = 0; virtual bool soundExists(int sound) = 0; virtual void updateSoundPosition(int sound, v3f pos) = 0; + virtual bool updateSoundGain(int id, float gain) = 0; + virtual float getSoundGain(int id) = 0; + virtual void step(float dtime) = 0; + virtual void fadeSound(int sound, float step, float gain) = 0; int playSound(const SimpleSoundSpec &spec, bool loop) { - return playSound(spec.name, loop, spec.gain); + return playSound(spec.name, loop, spec.gain, spec.fade); } int playSoundAt(const SimpleSoundSpec &spec, bool loop, v3f pos) { @@ -93,7 +98,10 @@ public: } void updateListener(v3f pos, v3f vel, v3f at, v3f up) {} void setListenerGain(float gain) {} - int playSound(const std::string &name, bool loop, float volume) { return 0; } + int playSound(const std::string &name, bool loop, float volume, float fade) + { + return 0; + } int playSoundAt(const std::string &name, bool loop, float volume, v3f pos) { return 0; @@ -101,6 +109,10 @@ public: void stopSound(int sound) {} bool soundExists(int sound) { return false; } void updateSoundPosition(int sound, v3f pos) {} + bool updateSoundGain(int id, float gain) { return false; } + float getSoundGain(int id) { return 0; } + void step(float dtime) { } + void fadeSound(int sound, float step, float gain) { } }; // Global DummySoundManager singleton -- cgit v1.2.3 From 9a9ae7d65c0112f3b3107547505553a07d7e20c3 Mon Sep 17 00:00:00 2001 From: Loic Blot Date: Thu, 4 May 2017 07:52:31 +0200 Subject: LINT fix since cloud API merge --- src/sound.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/sound.h') diff --git a/src/sound.h b/src/sound.h index 7bdb6a26b..76c0d1be4 100644 --- a/src/sound.h +++ b/src/sound.h @@ -65,8 +65,8 @@ public: // sound. If name=="", call should be ignored without error. virtual int playSound(const std::string &name, bool loop, float volume, float fade = 0) = 0; - virtual int playSoundAt(const std::string &name, bool loop, float volume, - v3f pos) = 0; + virtual int playSoundAt( + const std::string &name, bool loop, float volume, v3f pos) = 0; virtual void stopSound(int sound) = 0; virtual bool soundExists(int sound) = 0; virtual void updateSoundPosition(int sound, v3f pos) = 0; @@ -111,8 +111,8 @@ public: void updateSoundPosition(int sound, v3f pos) {} bool updateSoundGain(int id, float gain) { return false; } float getSoundGain(int id) { return 0; } - void step(float dtime) { } - void fadeSound(int sound, float step, float gain) { } + void step(float dtime) {} + void fadeSound(int sound, float step, float gain) {} }; // Global DummySoundManager singleton -- cgit v1.2.3