X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FSound.hh;h=e5d312a776acfe26533a2224260a16c95bd1d2e6;hp=cca7dc7e637fd2b9cd61fe3ecac024db9d03a9e6;hb=ca0f7bdfba63140dca0bd20586d31980f3938eb2;hpb=bfa6212d09d8735d8fd5e2638188e4a99f21ada4

diff --git a/src/Moof/Sound.hh b/src/Moof/Sound.hh
index cca7dc7..e5d312a 100644
--- a/src/Moof/Sound.hh
+++ b/src/Moof/Sound.hh
@@ -31,13 +31,12 @@
 
 /**
  * @file Sound.hh
- * Image-loading and OpenGL texture loading.
+ * Load and play sounds, current supports ogg vorbis.
  */
 
-#include <stdexcept>
-
 #include <boost/shared_ptr.hpp>
 
+#include <Moof/Exception.hh>
 #include <Moof/Math.hh>
 #include <Moof/Resource.hh>
 
@@ -45,36 +44,81 @@
 namespace Mf {
 
 
+class Sound;
+typedef boost::shared_ptr<Sound> SoundP;
+
+
 class Sound : public Resource
 {
+	class Impl;
+	boost::shared_ptr<Impl> impl_;
+
 public:
-	Sound(const std::string& name);
+
+	static SoundP alloc(const std::string& name)
+	{
+		return SoundP(new Sound(name));
+	}
+
+	explicit Sound(const std::string& name);
+
 
 	void play();
+	void stream();
 
-	static std::string getPath(const std::string& name);
+	// TODO - i don't like how there are two different methods that essentially
+	// do the same thing; the API should be exactly the same for both types of
+	// sounds; need a different way to distinguish how to handle the sound
 
-	struct Exception : std::runtime_error
-	{
-		explicit Exception(const std::string& what_arg) :
-			std::runtime_error(what_arg) {}
-	};
+	void stop();
+	void pause();
+	void resume();
+	void toggle();
 
-protected:
-	Sound() {}
-	class Impl;
-	boost::shared_ptr<Impl> impl_;
-};
+	void setSample(const std::string& name);
+	void enqueue(const std::string& name);
 
+	bool isPlaying() const;
 
-class SoundStream : public Sound
-{
-public:
-	SoundStream(const std::string& name);
+	void setPosition(const Vector3& position);
+	void setVelocity(const Vector3& velocity);
+	void setGain(Scalar gain);
+	void setPitch(Scalar pitch);
+	void setLooping(bool looping);
 
-	void update(Scalar t, Scalar dt);
+	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);
+
+
+	struct Exception : public Mf::Exception
+	{
+		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();
+		}
+	};
 };