SDL_FreeSurface(context_);
context_ = 0;
setVideoMode(attribs_.mode);
- Mf::Dispatcher::instance().dispatch("video.context_recreated");
+ Mf::Dispatcher::getInstance().dispatch("video.context_recreated");
}
void Video::setOpenGLAttributes()
cursorVisible = true;
cursorGrab = false;
- std::vector<SerializablePtr> colors;
- Settings::instance().get("video.colorbuffers", colors);
+ Settings& settings = Settings::getInstance();
+
+ Serializable::Array colors;
+ settings.get("video.colorbuffers", colors);
if (colors.size() > 0) colors[0]->get(colorBuffer[0]);
if (colors.size() > 1) colors[1]->get(colorBuffer[1]);
if (colors.size() > 2) colors[2]->get(colorBuffer[2]);
if (colors.size() > 3) colors[3]->get(colorBuffer[3]);
- Settings::instance().get("video.framebuffer", frameBuffer);
- Settings::instance().get("video.doublebuffer", doubleBuffer);
- Settings::instance().get("video.depthbuffer", depthBuffer);
- Settings::instance().get("video.stencilbuffer", stencilBuffer);
+ settings.get("video.framebuffer", frameBuffer);
+ settings.get("video.doublebuffer", doubleBuffer);
+ settings.get("video.depthbuffer", depthBuffer);
+ settings.get("video.stencilbuffer", stencilBuffer);
- std::vector<SerializablePtr> accum;
- Settings::instance().get("video.accumbuffers", accum);
+ Serializable::Array accum;
+ settings.get("video.accumbuffers", accum);
if (accum.size() > 0) accum[0]->get(accumBuffer[0]);
if (accum.size() > 1) accum[1]->get(accumBuffer[1]);
if (accum.size() > 2) accum[2]->get(accumBuffer[2]);
if (accum.size() > 3) accum[3]->get(accumBuffer[3]);
- Settings::instance().get("video.stereo", stereo);
- Settings::instance().get("video.multiesamplebuffers", multisampleBuffers);
- Settings::instance().get("video.multiesamplesamples", multisampleSamples);
- Settings::instance().get("video.swapcontrol", swapControl);
- Settings::instance().get("video.hardwareonly", hardwareonly);
+ settings.get("video.stereo", stereo);
+ settings.get("video.multiesamplebuffers", multisampleBuffers);
+ settings.get("video.multiesamplesamples", multisampleSamples);
+ settings.get("video.swapcontrol", swapControl);
+ settings.get("video.hardwareonly", hardwareonly);
- if (!Settings::instance().get("video.caption", caption))
+ if (!settings.get("video.caption", caption))
{
caption = "Untitled";
}
- Settings::instance().get("video.icon", icon);
+ settings.get("video.icon", icon);
- std::vector<SerializablePtr> dimensions;
- Settings::instance().get("video.mode", dimensions);
+ Serializable::Array dimensions;
+ settings.get("video.mode", dimensions);
if (dimensions.size() > 0) dimensions[0]->get(mode[0]);
if (dimensions.size() > 1) dimensions[1]->get(mode[1]);
if (dimensions.size() > 2) dimensions[2]->get(mode[2]);
- Settings::instance().get("video.fullscreen", fullscreen);
- Settings::instance().get("video.resizable", resizable);
- Settings::instance().get("video.showcursor", cursorVisible);
- Settings::instance().get("input.grab", cursorGrab);
+ settings.get("video.fullscreen", fullscreen);
+ settings.get("video.resizable", resizable);
+ settings.get("video.showcursor", cursorVisible);
+ settings.get("input.grab", cursorGrab);
}