dispatch class not a singleton, engine is static

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

diff --git a/src/Moof/Video.cc b/src/Moof/Video.cc
index e4579fbc700951215a32b0669a2602c5b7f62fbf..8dab056c645843d391e78868ce9b72a8e1c9b6dc 100644 (file)
--- a/src/Moof/Video.cc
+++ b/src/Moof/Video.cc
@@ -28,7 +28,7 @@
 
 #include "Dispatch.hh"
 #include "Engine.hh"
-#include "Exception.hh"
+#include "Error.hh"
 #include "Image.hh"
 #include "Log.hh"
 #include "Settings.hh"
@@ -64,9 +64,6 @@ Video::Video(const std::string& caption, const std::string& icon)
 
 void Video::init(const Attributes& attribs)
 {
-       // make sure the engine is initialized before setting up the video
-       Engine::getInstance();
-
        mContext = 0;
        mFlags = 0;
        mAttribs = attribs;
@@ -140,7 +137,7 @@ void Video::setVideoMode(const long mode[3])
                        logInfo("video context recreated");
 #endif
                }
-               else throw Exception(ErrorCode::SDL_VIDEOMODE);
+               else throw Error(Error::SDL_VIDEOMODE);
        }
 }