refactoring needed for win32 crash

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

diff --git a/src/Moof/Video.hh b/src/Moof/Video.hh
index 736832f09d0277edb4da88e1a393e327dd934d63..0199bc51dc43e3a38508fae9da2d81149b4a7ac0 100644 (file)
--- a/src/Moof/Video.hh
+++ b/src/Moof/Video.hh
@@ -35,7 +35,7 @@
 
 #include <SDL/SDL.h>
 
-#include <Moof/Exception.hh>
+#include <Moof/Core.hh>
 
 
 namespace Mf {
@@ -74,6 +74,10 @@ public:
                bool            cursorGrab;
 
                Attributes();
+
+       private:
+
+               Backend         backend;
        };
 
 
@@ -84,7 +88,7 @@ public:
 
        Video();
        explicit Video(const Attributes& attribs);
-       explicit Video(const std::string& caption, const std::string& icon);
+       Video(const std::string& caption, const std::string& icon);
        ~Video();
 
        void setVideoMode(const long mode[3]);
@@ -96,6 +100,8 @@ public:
        void setCaption(const std::string& caption);
        std::string getCaption() const;
 
+       const std::string& getIcon() const;
+
        void setFull(bool full);
        void toggleFull();
        bool isFull() const;
@@ -112,24 +118,11 @@ public:
        void toggleCursorGrab();
        bool isCursorGrab() const;
 
-       void makeActive();
        void swap();
 
        int getWidth() const;
        int getHeight() const;
 
-
-       struct Exception : public Mf::Exception
-       {
-               explicit Exception(unsigned error) :
-                       Mf::Exception(error) {}
-
-               void raise()
-               {
-                       throw *this;
-               }
-       };
-
 private:
 
        void init(const Attributes& attribs);
@@ -147,6 +140,9 @@ private:
 };
 
 
+extern Video* video;
+
+
 } // namespace Mf
 
 #endif // _MOOF_VIDEO_HH_