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 eeec47e7eb7d4dcc00b4a6b17fd732f8e61fc93a..8dab056c645843d391e78868ce9b72a8e1c9b6dc 100644 (file)
--- a/src/Moof/Video.cc
+++ b/src/Moof/Video.cc
@@ -26,11 +26,10 @@
 
 *******************************************************************************/
 
-#include <SDL/SDL_image.h>
-
 #include "Dispatch.hh"
 #include "Engine.hh"
-#include "Exception.hh"
+#include "Error.hh"
+#include "Image.hh"
 #include "Log.hh"
 #include "Settings.hh"
 #include "Video.hh"
@@ -65,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;
@@ -141,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);
        }
 }
 
@@ -173,12 +169,8 @@ void Video::setIcon()
 {
        if (mAttribs.icon != "")
        {
-               SDL_Surface* icon = IMG_Load(mAttribs.icon.c_str());
-               if (icon)
-               {
-                       SDL_WM_SetIcon(icon, 0);
-                       SDL_FreeSurface(icon);
-               }
+               Image icon(mAttribs.icon);
+               icon.setAsIcon();
        }
 }