library class revamped as manager, goodbye tilemap

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

diff --git a/src/Moof/Video.cc b/src/Moof/Video.cc
index 62addb406dc804b7a31644ef586b3a43b3dd1dce..e0716091fcc7a4e4ce1d07a48328d9a1a77a66e3 100644 (file)
--- a/src/Moof/Video.cc
+++ b/src/Moof/Video.cc
@@ -39,42 +39,39 @@ namespace Mf {
 
 Video::Video()
 {
-       init(mAttribs);
+       init();
 }
 
-Video::Video(const Attributes& attribs)
+Video::Video(const Attributes& attribs) :
+       mAttribs(attribs)
 {
-       init(attribs);
+       init();
 }
 
 Video::Video(const std::string& caption, const std::string& icon)
 {
-       if (mAttribs.caption == "Untitled")
-       {
-               mAttribs.caption = caption;
-       }
-       if (mAttribs.icon == "")
-       {
-               mAttribs.icon = icon;
-       }
+       mAttribs.caption = caption;
+       mAttribs.icon = icon;
 
-       init(mAttribs);
+       init();
 }
 
-void Video::init(const Attributes& attribs)
+void Video::init()
 {
+       Error error = Backend::getError();
+       if (error) error.raise();
+
        mContext = 0;
        mFlags = 0;
-       mAttribs = attribs;
 
-       setFull(attribs.fullscreen);
-       setResizable(attribs.resizable);
+       setFull(mAttribs.fullscreen);
+       setResizable(mAttribs.resizable);
        setOpenGLAttributes();
-       setCaption(attribs.caption);
+       setCaption(mAttribs.caption);
        setIcon();
-       setCursorVisible(attribs.cursorVisible);
-       setCursorGrab(attribs.cursorGrab);
-       setVideoMode(attribs.mode);
+       setCursorVisible(mAttribs.cursorVisible);
+       setCursorGrab(mAttribs.cursorGrab);
+       setVideoMode(mAttribs.mode);
 
        video = this;
 }
@@ -104,7 +101,7 @@ void Video::setOpenGLAttributes()
        SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS, mAttribs.multisampleBuffers);
        SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, mAttribs.multisampleSamples);
        SDL_GL_SetAttribute(SDL_GL_SWAP_CONTROL,       mAttribs.swapControl);
-       SDL_GL_SetAttribute(SDL_GL_ACCELERATED_VISUAL, mAttribs.hardwareonly);
+       SDL_GL_SetAttribute(SDL_GL_ACCELERATED_VISUAL, mAttribs.hardwareOnly);
 }
 
 
@@ -312,7 +309,7 @@ Video::Attributes::Attributes()
        multisampleBuffers = 0;
        multisampleSamples = 0;
        swapControl = false;
-       hardwareonly = false;
+       hardwareOnly = false;
        mode[0] = 640;
        mode[1] = 480;
        mode[2] = 0;
@@ -344,7 +341,7 @@ Video::Attributes::Attributes()
        settings.get("multiesamplebuffers", multisampleBuffers);
        settings.get("multiesamplesamples", multisampleSamples);
        settings.get("swapcontrol", swapControl);
-       settings.get("hardwareonly", hardwareonly);
+       settings.get("hardwareonly", hardwareOnly);
 
        if (!settings.get("caption", caption))
        {
@@ -364,7 +361,7 @@ Video::Attributes::Attributes()
                mode[0] = dimensions[0];
                mode[1] = dimensions[1];
        }
-       else if (fullscreen)
+       else if (fullscreen && Backend::isInitialized())
        {
                SDL_Rect** modes = SDL_ListModes(NULL, SDL_FULLSCREEN | SDL_HWSURFACE);