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

diff --git a/src/sound.h b/src/sound.h
index 6b20bbd32..6f7b0a1af 100644
--- a/src/sound.h
+++ b/src/sound.h
@@ -1,77 +1,62 @@
 /*
-Minetest-c55
-Copyright (C) 2012 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+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 General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
 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.h"
-#include <string>
-#include <vector>
 #include <set>
+#include <string>
+#include "util/serialize.h"
+#include "irrlichttypes_bloated.h"
 
-class OnDemandSoundFetcher
-{
-public:
-	virtual void getSoundFilenames(const std::string &name,
-			std::set<std::string> &dst);
-};
-
-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 loadSound(const std::string &name,
-			const std::string &filepath) = 0;
-	virtual bool loadSound(const std::string &name,
-			const std::vector<char> &filedata) = 0;
-
-	virtual void updateListener(v3f pos, v3f vel, v3f at, v3f up) = 0;
-	// playSound functions return -1 on failure, otherwise a handle to the
-	// sound
-	virtual int playSound(const std::string &name, int loopcount,
-			float volume) = 0;
-	virtual int playSoundAt(const std::string &name, int loopcount,
-			v3f pos, float volume) = 0;
-	virtual void stopSound(int sound) = 0;
-};
-
-class DummySoundManager: public ISoundManager
+struct SimpleSoundSpec
 {
-public:
-	virtual bool loadSound(const std::string &name,
-			const std::string &filepath) {return true;}
-	virtual bool loadSound(const std::string &name,
-			const std::vector<char> &filedata) {return true;}
-	void updateListener(v3f pos, v3f vel, v3f at, v3f up) {}
-	int playSound(const std::string &name, int loopcount,
-			float volume) {return 0;}
-	int playSoundAt(const std::string &name, int loopcount,
-			v3f pos, float volume) {return 0;}
-	void stopSound(int sound) {}
+	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);
+	}
+
+	std::string name;
+	float gain = 1.0f;
+	float fade = 0.0f;
+	float pitch = 1.0f;
 };
-
-// Global DummySoundManager singleton
-extern DummySoundManager dummySoundManager;
-
-#endif
-