minor refactoring and state progress

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

diff --git a/src/Moof/Video.hh b/src/Moof/Video.hh
index 5f56f9e1d33e103ac0bf912b7f6584d0e45b516d..736832f09d0277edb4da88e1a393e327dd934d63 100644 (file)
--- a/src/Moof/Video.hh
+++ b/src/Moof/Video.hh
@@ -45,8 +45,10 @@ class Video;
 typedef boost::shared_ptr<Video> VideoP;
 
 
-struct Video
+class Video
 {
+public:
+
        struct Attributes
        {
                // OpenGL attributes
@@ -75,21 +77,6 @@ struct Video
        };
 
 
-private:
-
-       void init(const Attributes& attribs);
-
-       void recreateContext();
-       void setOpenGLAttributes();
-
-       void setIcon();
-
-       SDL_Surface* context_;
-       unsigned flags_;
-       Attributes attribs_;
-
-public:
-
        static VideoP alloc(const std::string& caption, const std::string& icon)
        {
                return VideoP(new Video(caption, icon));
@@ -142,6 +129,21 @@ public:
                        throw *this;
                }
        };
+
+private:
+
+       void init(const Attributes& attribs);
+
+       void recreateContext();
+       void setOpenGLAttributes();
+
+       void setIcon();
+
+       // TODO this implementation should be hidden
+
+       SDL_Surface*    mContext;
+       unsigned                mFlags;
+       Attributes              mAttribs;
 };