dispatch class not a singleton, engine is static

[chaz/yoink] / src / Moof / Sound.hh

diff --git a/src/Moof/Sound.hh b/src/Moof/Sound.hh
index c9929cedeae2169b4c61bedf7d557802395f47ba..14cd79041ac10cbdc2e0b53d4f295b5090bc26b6 100644 (file)
--- 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,60 +59,57 @@ 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(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();
 };