X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fsound.h;h=6f7b0a1af23616983f745e66b156fc1baed01586;hb=61a196378ff91411af3245504c5861da026b3b25;hp=ba2d629d2db1a6ea98d530279f0fbcb51585f4ba;hpb=f7088f69ab7406ea9fefa853fa7ce11f914e88cf;p=minetest.git

diff --git a/src/sound.h b/src/sound.h
index ba2d629d2..6f7b0a1af 100644
--- a/src/sound.h
+++ b/src/sound.h
@@ -17,91 +17,46 @@ 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>
+#include "util/serialize.h"
 #include "irrlichttypes_bloated.h"
 
-class OnDemandSoundFetcher
-{
-public:
-	virtual void fetchSounds(const std::string &name,
-			std::set<std::string> &dst_paths,
-			std::set<std::string> &dst_datas) = 0;
-};
-
 struct SimpleSoundSpec
 {
-	std::string name;
-	float gain;
-	SimpleSoundSpec(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() { return name != ""; }
-	// Serialization intentionally left out
-};
 
-class ISoundManager
-{
-public:
-	virtual ~ISoundManager() {}
+	bool exists() const { return !name.empty(); }
 
-	// 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 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 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);
-	}
-	int playSoundAt(const SimpleSoundSpec &spec, bool loop, v3f pos)
+	// Take cf_version from ContentFeatures::serialize to
+	// keep in sync with item definitions
+	void serialize(std::ostream &os, u8 cf_version) const
 	{
-		return playSoundAt(spec.name, loop, spec.gain, pos);
+		os << serializeString16(name);
+		writeF32(os, gain);
+		writeF32(os, pitch);
+		writeF32(os, fade);
+		// if (cf_version < ?)
+		//     return;
 	}
-};
 
-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;
-	}
-	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)
+	void deSerialize(std::istream &is, u8 cf_version)
 	{
-		return 0;
+		name = deSerializeString16(is);
+		gain = readF32(is);
+		pitch = readF32(is);
+		fade = readF32(is);
 	}
-	void stopSound(int sound) {}
-	bool soundExists(int sound) { return false; }
-	void updateSoundPosition(int sound, v3f pos) {}
-};
-
-// Global DummySoundManager singleton
-extern DummySoundManager dummySoundManager;
 
-#endif
+	std::string name;
+	float gain = 1.0f;
+	float fade = 0.0f;
+	float pitch = 1.0f;
+};