considerable refactoring

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

diff --git a/src/Moof/Video.hh b/src/Moof/Video.hh
index a76dca268ef052f136124bc425769d6f65a32f72..4be691dcf62ec0af20c06abf9bab6cdd58ff4ee0 100644 (file)
--- a/src/Moof/Video.hh
+++ b/src/Moof/Video.hh
@@ -39,38 +39,64 @@
 namespace Mf {
 
 
-class Video
+class Video;
+typedef boost::shared_ptr<Video> VideoP;
+
+
+struct Video
 {
-public:
        struct Attributes
        {
                // OpenGL attributes
-               long    colorBuffer[4]; // rgba
-               long    frameBuffer;
-               bool    doubleBuffer;
-               long    depthBuffer;
-               long    stencilBuffer;
-               long    accumBuffer[4]; // rgba
-               bool    stereo;
-               long    multisampleBuffers;
-               long    multisampleSamples;
-               bool    swapControl;
-               bool    hardwareonly;
+               long            colorBuffer[4]; // rgba
+               long            frameBuffer;
+               bool            doubleBuffer;
+               long            depthBuffer;
+               long            stencilBuffer;
+               long            accumBuffer[4]; // rgba
+               bool            stereo;
+               long            multisampleBuffers;
+               long            multisampleSamples;
+               bool            swapControl;
+               bool            hardwareonly;
 
                // Window attributes
-               long    mode[3];                // width, height, bpp
-               bool    fullscreen;
-               bool    resizable;
-               bool    cursorVisible;
-               bool    cursorGrab;
+               std::string     caption;
+               std::string     icon;
+               long            mode[3];                // width, height, bpp
+               bool            fullscreen;
+               bool            resizable;
+               bool            cursorVisible;
+               bool            cursorGrab;
 
                Attributes();
        };
 
+
+private:
+
+       void init(const Attributes& attribs);
+
+       void recreateContext();
+       void setOpenGLAttributes();
+
+       void setIcon();
+
+       SDL_Surface* context_;
+       unsigned flags_;
+       Attributes attribs_;
+
+public:
+
+       inline static VideoP alloc(const std::string& caption,
+                       const std::string& icon)
+       {
+               return VideoP(new Video(caption, icon));
+       }
+
        Video();
-       Video(const Attributes& attribs);
-       Video(const Attributes& attribs, const std::string& caption);
-       Video(const std::string& caption);
+       explicit Video(const Attributes& attribs);
+       explicit Video(const std::string& caption, const std::string& icon);
        ~Video();
 
        void setVideoMode(const long mode[3]);
@@ -107,19 +133,8 @@ public:
                explicit Exception(const std::string& what_arg) :
                        std::runtime_error(what_arg) {}
        };
-
-private:
-       void init(const Attributes& attribs, const std::string& caption);
-       void recreateContext();
-       void setOpenGLAttributes();
-
-       SDL_Surface* context_;
-       unsigned flags_;
-       Attributes attribs_;
 };
 
-typedef boost::shared_ptr<Video> VideoPtr;
-
 
 } // namespace Mf