Particles: Do not add digging particles for airlike nodes (#6392)

[minetest.git] / src / sound.h

diff --git a/src/sound.h b/src/sound.h
index d13799eac43478e2ae0d9c2f3010c06a3bd68d5e..f52746369d09934369f0fb5c1b8c7ad851f07556 100644 (file)
--- a/src/sound.h
+++ b/src/sound.h
@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef SOUND_HEADER
-#define SOUND_HEADER
+#pragma once
 
 #include <set>
 #include <string>
@@ -34,21 +33,24 @@ class OnDemandSoundFetcher
 
 struct SimpleSoundSpec
 {
-       SimpleSoundSpec(const std::string &name = "", float gain = 1.0) :
-               name(name),
-               gain(gain)
-       {}
+       SimpleSoundSpec(const std::string &name = "", float gain = 1.0f,
+                       float fade = 0.0f, float pitch = 1.0f)
+           : name(name), gain(gain), fade(fade), pitch(pitch)
+       {
+       }
 
-       bool exists() const { return name != ""; }
+       bool exists() const { return !name.empty(); }
 
-       std::string name;
-       float gain;
+       std::string name = "";
+       float gain = 1.0f;
+       float fade = 0.0f;
+       float pitch = 1.0f;
 };
 
 class ISoundManager
 {
 public:
-       virtual ~ISoundManager() {}
+       virtual ~ISoundManager() = default;
 
        // Multiple sounds can be loaded per name; when played, the sound
        // should be chosen randomly from alternatives
@@ -63,20 +65,25 @@ class ISoundManager
 
        // 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.0f, float pitch = 1.0f) = 0;
+       virtual int playSoundAt(const std::string &name, bool loop, float volume, v3f pos,
+                       float pitch = 1.0f) = 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, spec.pitch);
        }
-       int playSoundAt(const SimpleSoundSpec &spec, bool loop, v3f pos)
+       int playSoundAt(const SimpleSoundSpec &spec, bool loop, const v3f &pos)
        {
-               return playSoundAt(spec.name, loop, spec.gain, pos);
+               return playSoundAt(spec.name, loop, spec.gain, pos, spec.pitch);
        }
 };
 
@@ -93,17 +100,24 @@ class DummySoundManager : public ISoundManager
        }
        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)
+       int playSound(const std::string &name, bool loop, float volume, float fade,
+                       float pitch)
+       {
+               return 0;
+       }
+       int playSoundAt(const std::string &name, bool loop, float volume, v3f pos,
+                       float pitch)
        {
                return 0;
        }
        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
 extern DummySoundManager dummySoundManager;
-
-#endif