X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fsound.h;h=6f7b0a1af23616983f745e66b156fc1baed01586;hb=0f74c7a977c412a81890926548e2a5c8dae5f6eb;hp=1f9b7d6e1ab156d701a8f7375c477e7c4105392b;hpb=497ff1ecd64c8908f988e15ca879824f2781e3fd;p=dragonfireclient.git

diff --git a/src/sound.h b/src/sound.h
index 1f9b7d6e1..6f7b0a1af 100644
--- a/src/sound.h
+++ b/src/sound.h
@@ -1,6 +1,6 @@
 /*
 Minetest
-Copyright (C) 2012 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -17,85 +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 "irrlichttypes_bloated.h"
-#include <string>
 #include <set>
-
-class OnDemandSoundFetcher
-{
-public:
-	virtual void fetchSounds(const std::string &name,
-			std::set<std::string> &dst_paths,
-			std::set<std::string> &dst_datas) = 0;
-};
+#include <string>
+#include "util/serialize.h"
+#include "irrlichttypes_bloated.h"
 
 struct SimpleSoundSpec
 {
-	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
-{
-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;
-
-	// 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)
-		{ return playSoundAt(spec.name, loop, spec.gain, pos); }
-};
+	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.empty(); }
+
+	// Take cf_version from ContentFeatures::serialize to
+	// keep in sync with item definitions
+	void serialize(std::ostream &os, u8 cf_version) const
+	{
+		os << serializeString16(name);
+		writeF32(os, gain);
+		writeF32(os, pitch);
+		writeF32(os, fade);
+		// if (cf_version < ?)
+		//     return;
+	}
+
+	void deSerialize(std::istream &is, u8 cf_version)
+	{
+		name = deSerializeString16(is);
+		gain = readF32(is);
+		pitch = readF32(is);
+		fade = readF32(is);
+	}
 
-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) {return 0;}
-	void stopSound(int sound) {}
-	bool soundExists(int sound) {return false;}
-	void updateSoundPosition(int sound, v3f pos) {}
+	std::string name;
+	float gain = 1.0f;
+	float fade = 0.0f;
+	float pitch = 1.0f;
 };
-
-// Global DummySoundManager singleton
-extern DummySoundManager dummySoundManager;
-
-#endif
-