foundational changes; tying up some loose ends

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

diff --git a/src/Moof/Video.cc b/src/Moof/Video.cc
index 9fdd47893652109704f589acc8aa0a5c6b6ad337..eeec47e7eb7d4dcc00b4a6b17fd732f8e61fc93a 100644 (file)
--- a/src/Moof/Video.cc
+++ b/src/Moof/Video.cc
@@ -28,7 +28,8 @@
 
 #include <SDL/SDL_image.h>
 
-#include "Dispatcher.hh"
+#include "Dispatch.hh"
+#include "Engine.hh"
 #include "Exception.hh"
 #include "Log.hh"
 #include "Settings.hh"
@@ -64,6 +65,9 @@ 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;
@@ -132,7 +136,8 @@ void Video::setVideoMode(const long mode[3])
                        // on win32, creating a new context via SDL_SetVideoMode will wipe
                        // out the GL state, so we gotta notify everyone to reload their
                        // state after the change
-                       Mf::dispatcher::dispatch("video.context_recreated");
+                       Engine::getInstance().dispatch("video.newcontext");
+
                        logInfo("video context recreated");
 #endif
                }
@@ -182,6 +187,11 @@ std::string Video::getCaption() const
        return mAttribs.caption;
 }
 
+const std::string& Video::getIcon() const
+{
+       return mAttribs.icon;
+}
+
 
 void Video::setFull(bool full)
 {
@@ -275,12 +285,6 @@ void Video::setCursorGrab(bool cursorGrab)
 }
 
 
-void Video::makeActive()
-{
-       // NOP until the day SDL supports more than only one window.
-       // Still waiting...
-}
-
 void Video::swap()
 {
        SDL_GL_SwapBuffers();