X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FSound.hh;h=6e5f78a23fc4311e736000aecd922f534a003a3a;hp=32f4c87097fed36cf82c651c0a32dad75ad2082d;hb=7e84479de612a4ce287c6f63deb014b447a993ec;hpb=57b78ebe21b1b48acd337daa5a1cb8c383959cfa

diff --git a/src/Moof/Sound.hh b/src/Moof/Sound.hh
index 32f4c87..6e5f78a 100644
--- a/src/Moof/Sound.hh
+++ b/src/Moof/Sound.hh
@@ -31,7 +31,7 @@
 
 /**
  * @file Sound.hh
- * Image-loading and OpenGL texture loading.
+ * Load and play sounds, current supports ogg vorbis.
  */
 
 #include <boost/shared_ptr.hpp>
@@ -47,71 +47,70 @@ namespace Mf {
 class Sound;
 typedef boost::shared_ptr<Sound> SoundP;
 
+class SoundStream;
+typedef boost::shared_ptr<SoundStream> SoundStreamP;
+
 
 class Sound : public Resource
 {
-	class Impl;
-	boost::shared_ptr<Impl> impl_;
-
 public:
 
-	inline static SoundP alloc(const std::string& name)
+	static SoundP alloc(const std::string& name)
 	{
 		return SoundP(new Sound(name));
 	}
 
+	Sound();
 	explicit Sound(const std::string& name);
 
+	virtual ~Sound() {}
 
-	void play();
-
-	void stream();
-	void update(Scalar t, Scalar dt);
+	// this implicitly stops the sound if it is playing
+	void setSample(const std::string& name);
 
+	virtual void play();
 	void stop();
 	void pause();
-	void resume();
-	void toggle();
-
-	void setSample(const std::string& name);
-	void enqueue(const std::string& name);
 
+	void toggle();
 	bool isPlaying() const;
 
-	void setPosition(Vector3 position);
-	void setVelocity(Vector3 velocity);
+	void setPosition(const Vector3& position);
+	void setVelocity(const Vector3& velocity);
 	void setGain(Scalar gain);
 	void setPitch(Scalar pitch);
 	void setLooping(bool looping);
 
+	static void setListenerPosition(const Vector3& position);
+	static void setListenerVelocity(const Vector3& velocity);
+	static void setListenerOrientation(const Vector3& forward,
+			const Vector3& up);
+
 	static std::string getPath(const std::string& name);
 
+protected:
 
-	struct Exception : public Mf::Exception
+	class Impl;
+	boost::shared_ptr<Impl> mImpl;
+};
+
+
+class SoundStream : public Sound
+{
+public:
+
+	static SoundStreamP alloc(const std::string& name)
 	{
-		enum
-		{
-			BAD_AUDIO_FORMAT	= 1024
-		};
-
-		explicit Exception(unsigned error) :
-			Mf::Exception(error) {}
-
-		void raise()
-		{
-			throw *this;
-		}
-
-		const char* what() const throw()
-		{
-			switch (code)
-			{
-				case BAD_AUDIO_FORMAT:
-					return "unknown audio format";
-			}
-			return Mf::Exception::what();
-		}
-	};
+		return SoundStreamP(new SoundStream(name));
+	}
+
+	SoundStream();
+	explicit SoundStream(const std::string& name) :
+		Sound(name) {}
+
+	void enqueue(const std::string& name);
+
+	void play();
 };