big batch of changes

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

diff --git a/src/Moof/Sound.hh b/src/Moof/Sound.hh
index 3f64162f0ca4b2a690f3b7be7005095ee00a3f7c..982e9b4065eeca659601fd9015846407a2936fab 100644 (file)
--- 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>
@@ -52,11 +50,6 @@ typedef boost::shared_ptr<Sound> SoundP;
 
 class Sound : public Resource
 {
-protected:
-       Sound() {}
-       class Impl;
-       boost::shared_ptr<Impl> impl_;
-
 public:
 
        static SoundP alloc(const std::string& name)
@@ -64,53 +57,42 @@ public:
                return SoundP(new Sound(name));
        }
 
-       Sound(const std::string& name);
+       Sound();
+       explicit Sound(const std::string& name);
+
 
        void play();
-       void pause();
-       void togglePlayPause();
+       void stream();
 
-       void setGain(Scalar gain);
+       // TODO this API sucks...  refactor me!!
 
-       static std::string getPath(const std::string& name);
+       void stop();
+       void pause();
+       void resume();
+       void toggle();
 
+       void setSample(const std::string& name);
+       void enqueue(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();
-               }
-       };
-};
-
+       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);
+
+private:
+
+       class Impl;
+       boost::shared_ptr<Impl> mImpl;
 };