X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fsound.h;h=6f7b0a1af23616983f745e66b156fc1baed01586;hb=f2fd4432625ee5cf0380bdd006cd1f15d053b12f;hp=b9c8470799b9ff506dc8aa68558ff9438491e297;hpb=921151d97a2fb2238ab514324fb95e2732248b96;p=dragonfireclient.git

diff --git a/src/sound.h b/src/sound.h
index b9c847079..6f7b0a1af 100644
--- a/src/sound.h
+++ b/src/sound.h
@@ -21,102 +21,42 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #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
 {
 	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)
+			float fade = 0.0f, float pitch = 1.0f) :
+			name(name),
+			gain(gain), fade(fade), pitch(pitch)
 	{
 	}
 
-	bool exists() const { return name != ""; }
-
-	std::string name = "";
-	float gain = 1.0f;
-	float fade = 0.0f;
-	float pitch = 1.0f;
-};
-
-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
-	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;
+	bool exists() const { return !name.empty(); }
 
-	// 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,
-			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, spec.fade, spec.pitch);
-	}
-	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, spec.pitch);
+		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)
+	void deSerialize(std::istream &is, u8 cf_version)
 	{
-		return true;
+		name = deSerializeString16(is);
+		gain = readF32(is);
+		pitch = readF32(is);
+		fade = readF32(is);
 	}
-	void updateListener(v3f pos, v3f vel, v3f at, v3f up) {}
-	void setListenerGain(float gain) {}
-	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;
+	std::string name;
+	float gain = 1.0f;
+	float fade = 0.0f;
+	float pitch = 1.0f;
+};