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

diff --git a/src/Moof/Sound.hh b/src/Moof/Sound.hh
index 3f64162..6e5f78a 100644
--- a/src/Moof/Sound.hh
+++ b/src/Moof/Sound.hh
@@ -31,11 +31,9 @@
 
 /**
  * @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>
@@ -49,14 +47,12 @@ namespace Mf {
 class Sound;
 typedef boost::shared_ptr<Sound> SoundP;
 
+class SoundStream;
+typedef boost::shared_ptr<SoundStream> SoundStreamP;
+
 
 class Sound : public Resource
 {
-protected:
-	Sound() {}
-	class Impl;
-	boost::shared_ptr<Impl> impl_;
-
 public:
 
 	static SoundP alloc(const std::string& name)
@@ -64,53 +60,57 @@ public:
 		return SoundP(new Sound(name));
 	}
 
-	Sound(const std::string& name);
+	Sound();
+	explicit Sound(const std::string& name);
 
-	void play();
+	virtual ~Sound() {}
+
+	// this implicitly stops the sound if it is playing
+	void setSample(const std::string& name);
+
+	virtual void play();
+	void stop();
 	void pause();
-	void togglePlayPause();
 
+	void toggle();
+	bool isPlaying() const;
+
+	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
-	{
-		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();
-		}
-	};
+	class Impl;
+	boost::shared_ptr<Impl> mImpl;
 };
 
 
 class SoundStream : public Sound
 {
 public:
-	SoundStream(const std::string& name);
 
-	void update(Scalar t, Scalar dt);
+	static SoundStreamP alloc(const std::string& name)
+	{
+		return SoundStreamP(new SoundStream(name));
+	}
 
-	static std::string getPath(const std::string& name);
+	SoundStream();
+	explicit SoundStream(const std::string& name) :
+		Sound(name) {}
+
+	void enqueue(const std::string& name);
+
+	void play();
 };