testing new non-autotools build system

[chaz/yoink] / src / moof / video.cc

diff --git a/src/moof/video.cc b/src/moof/video.cc
index 32278cc77ca25422e72595fffab04eeb692040b2..aa49b03c249b9d2927d0b43e52adfd5a8a8b357b 100644 (file)
--- a/src/moof/video.cc
+++ b/src/moof/video.cc
@@ -321,7 +321,7 @@ video::attributes::attributes(const settings& settings)
        settings.get("fullscreen", is_fullscreen);
        settings.get("resizable", is_resizable);
        settings.get("showcursor", is_cursor_visible);
-       settings.get("grab", is_cursor_captured);
+       settings.get("capturecursor", is_cursor_captured);
 
        std::vector<int> dimensions;
        settings.get("videomode", dimensions);
@@ -337,12 +337,11 @@ video::attributes::attributes(const settings& settings)
 
                if (modes == (SDL_Rect**)0)
                {
-                       log_error("no native video mode");
+                       throw std::runtime_error("can't find appropriate video mode");
                }
                else if (modes == (SDL_Rect**)-1)
                {
-                       log_warning("any resolution allowed; "
-                                                  "choosing default 800x600");
+                       log_warning("any resolution allowed; choosing default 800x600");
                        mode[0] = 800;
                        mode[1] = 600;
                }
@@ -350,8 +349,8 @@ video::attributes::attributes(const settings& settings)
                {
                        mode[0] = (*modes)->w;
                        mode[1] = (*modes)->h;
-                       log_info << "choosing native resolution "
-                                       << mode[0] << "x" << mode[1] << std::endl;
+                       log_info << "choosing native resolution: "
+                                        << mode[0] << "x" << mode[1] << std::endl;
                }
        }
        if (dimensions.size() > 2) mode[2] = dimensions[2];