dispatch class not a singleton, engine is static

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

diff --git a/src/Moof/Sound.cc b/src/Moof/Sound.cc
index b91158a591e318fae4dba1e0ac03aa8ca5871e72..f9bdfd7a99622c22bb231405a768e2343c1ab690 100644 (file)
--- a/src/Moof/Sound.cc
+++ b/src/Moof/Sound.cc
@@ -36,7 +36,6 @@
 #include <vorbis/vorbisfile.h>
 
 #include "Engine.hh"
-#include "Exception.hh"
 #include "Library.hh"
 #include "Log.hh"
 #include "Sound.hh"
@@ -99,7 +98,7 @@ public:
                        {
                                logWarning << "error while loading sound "
                                                   << getName() << std::endl;
-                               throw Exception(ErrorCode::UNKNOWN_AUDIO_FORMAT, getName());
+                               throw Error(Error::UNKNOWN_AUDIO_FORMAT, getName());
                        }
 
                        vorbis_info* vorbisInfo = ov_info(&mOggStream, -1);
@@ -207,9 +206,6 @@ public:
 
        void init()
        {
-               // make sure the engine is initialized
-               Engine::getInstance();
-
                mIsLoaded = false;
                mIsPlaying = false;
                mIsLooping = false;