X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FSound.hh;h=c9929cedeae2169b4c61bedf7d557802395f47ba;hp=23979db4aa019423573fbb8e73a59f5a49a6cc89;hb=542e50a284c7f5b144a5c97c17f6d89b2af0175c;hpb=4701bf580b75a7d77a460c6f14f9fc31fb109bbb

diff --git a/src/Moof/Sound.hh b/src/Moof/Sound.hh
index 23979db..c9929ce 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,40 +44,76 @@
 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);
 
-	void play();
-	void pause();
-	void togglePlayPause();
+	static SoundP alloc(const std::string& name)
+	{
+		return SoundP(new Sound(name));
+	}
 
-	void setGain(Scalar gain);
+	explicit Sound(const std::string& name);
 
-	static std::string getPath(const std::string& name);
 
-	struct Exception : std::runtime_error
-	{
-		explicit Exception(const std::string& what_arg) :
-			std::runtime_error(what_arg) {}
-	};
+	void play();
+	void stream();
 
-protected:
-	Sound() {}
-	class Impl;
-	boost::shared_ptr<Impl> impl_;
-};
+	// 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
 
+	void stop();
+	void pause();
+	void resume();
+	void toggle();
 
-class SoundStream : public Sound
-{
-public:
-	SoundStream(const std::string& name);
+	void setSample(const std::string& name);
+	void enqueue(const std::string& name);
 
-	void update(Scalar t, Scalar dt);
+	bool isPlaying() const;
+
+	void setPosition(Vector3 position);
+	void setVelocity(Vector3 velocity);
+	void setGain(Scalar gain);
+	void setPitch(Scalar pitch);
+	void setLooping(bool looping);
 
 	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();
+		}
+	};
 };