X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FSound.cc;h=ca3ecfec8117fb93386edf6128c507d5ae41bcc2;hp=b91158a591e318fae4dba1e0ac03aa8ca5871e72;hb=987971a961454d97082c6448fdc0bbeb540281bb;hpb=7f3984f3f9524f5b6813e01ceb2fe576dadff94e

diff --git a/src/Moof/Sound.cc b/src/Moof/Sound.cc
index b91158a..ca3ecfe 100644
--- a/src/Moof/Sound.cc
+++ b/src/Moof/Sound.cc
@@ -35,8 +35,8 @@
 #include <vorbis/codec.h>
 #include <vorbis/vorbisfile.h>
 
-#include "Engine.hh"
-#include "Exception.hh"
+#include "Core.hh"
+#include "Error.hh"
 #include "Library.hh"
 #include "Log.hh"
 #include "Sound.hh"
@@ -66,7 +66,7 @@ public:
 	{
 	public:
 
-		Buffer(const std::string& name) :
+		explicit Buffer(const std::string& name) :
 			Library<Buffer>(name),
 			mBuffer(-1)
 		{
@@ -99,7 +99,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 +207,6 @@ public:
 
 	void init()
 	{
-		// make sure the engine is initialized
-		Engine::getInstance();
-
 		mIsLoaded = false;
 		mIsPlaying = false;
 		mIsLooping = false;
@@ -440,6 +437,8 @@ public:
 	std::deque<BufferP>		mQueue;
 
 	Timer					mStreamTimer;
+
+	Backend					mBackend;
 };