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

diff --git a/src/Moof/Sound.hh b/src/Moof/Sound.hh
index e5d312a..14cd790 100644
--- a/src/Moof/Sound.hh
+++ b/src/Moof/Sound.hh
@@ -36,7 +36,6 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include <Moof/Exception.hh>
 #include <Moof/Math.hh>
 #include <Moof/Resource.hh>
 
@@ -47,12 +46,12 @@ 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:
 
 	static SoundP alloc(const std::string& name)
@@ -60,24 +59,19 @@ public:
 		return SoundP(new Sound(name));
 	}
 
+	Sound();
 	explicit Sound(const std::string& name);
 
+	virtual ~Sound() {}
 
-	void play();
-	void stream();
-
-	// 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
+	// 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(const Vector3& position);
@@ -93,32 +87,29 @@ public:
 
 	static std::string getPath(const std::string& name);
 
+protected:
+
+	class Impl;
+	boost::shared_ptr<Impl> mImpl;
+};
+
+
+class SoundStream : public Sound
+{
+public:
 
-	struct Exception : public Mf::Exception
+	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();
 };