X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FSound.cc;h=f9bdfd7a99622c22bb231405a768e2343c1ab690;hp=3aec3f6aa90aa85f4c0f40936508a6ae01a2fff7;hb=a295f8def17036c8071b56e181364f99a377cae7;hpb=7e84479de612a4ce287c6f63deb014b447a993ec

diff --git a/src/Moof/Sound.cc b/src/Moof/Sound.cc
index 3aec3f6..f9bdfd7 100644
--- 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"
@@ -97,9 +96,9 @@ public:
 
 			if (result < 0)
 			{
-				logWarning("error while loading sound %s",
-						getName().c_str());
-				throw Exception(ErrorCode::UNKNOWN_AUDIO_FORMAT, getName());
+				logWarning << "error while loading sound "
+						   << getName() << std::endl;
+				throw Error(Error::UNKNOWN_AUDIO_FORMAT, getName());
 			}
 
 			vorbis_info* vorbisInfo = ov_info(&mOggStream, -1);
@@ -134,7 +133,8 @@ public:
 			}
 			if (size == 0)
 			{
-				logWarning("decoded no bytes from %s", getName().c_str());
+				logWarning << "decoded no bytes from "
+						   << getName() << std::endl;
 				return;
 			}
 
@@ -206,9 +206,6 @@ public:
 
 	void init()
 	{
-		// make sure the engine is initialized
-		Engine::getInstance();
-
 		mIsLoaded = false;
 		mIsPlaying = false;
 		mIsLooping = false;