big batch of changes

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

diff --git a/src/Moof/Sound.hh b/src/Moof/Sound.hh
index 4e80fbe783771864e807fddf99607f837b999b8b..982e9b4065eeca659601fd9015846407a2936fab 100644 (file)
--- a/src/Moof/Sound.hh
+++ b/src/Moof/Sound.hh
@@ -50,9 +50,6 @@ typedef boost::shared_ptr<Sound> SoundP;
 
 class Sound : public Resource
 {
-       class Impl;
-       boost::shared_ptr<Impl> mImpl;
-
 public:
 
        static SoundP alloc(const std::string& name)
@@ -60,13 +57,14 @@ public:
                return SoundP(new Sound(name));
        }
 
+       Sound();
        explicit Sound(const std::string& name);
 
 
        void play();
        void stream();
 
-       // TODO - this API sucks
+       // TODO this API sucks...  refactor me!!
 
        void stop();
        void pause();
@@ -91,32 +89,10 @@ public:
 
        static std::string getPath(const std::string& name);
 
+private:
 
-       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;
 };