]> git.sesse.net Git - casparcg/commitdiff
Allow user to specify name for ogl window. The name attribute was previous parsed...
authorTK3 <tomkaltz@gmail.com>
Fri, 1 Nov 2013 20:21:31 +0000 (16:21 -0400)
committerTK3 <tomkaltz@gmail.com>
Fri, 1 Nov 2013 20:21:31 +0000 (16:21 -0400)
modules/ogl/consumer/ogl_consumer.cpp

index 8e727752721d587c4d31d197236f4e89a9cfbcb8..079b1526c0c8f6c513cd4a30e4fbf9f70737a4be 100644 (file)
@@ -103,7 +103,7 @@ struct configuration
        bool                    vsync;\r
 \r
        configuration()\r
-               : name(L"ogl")\r
+               : name(L"Screen consumer")\r
                , screen_index(0)\r
                , stretch(fill)\r
                , windowed(true)\r
@@ -216,7 +216,7 @@ public:
                if(!GLEW_VERSION_2_1)\r
                        BOOST_THROW_EXCEPTION(not_supported() << msg_info("Missing OpenGL 2.1 support."));\r
 \r
-               window_.Create(sf::VideoMode(screen_width_, screen_height_, 32), narrow(L"Screen consumer " + channel_and_format()), config_.windowed ? sf::Style::Resize | sf::Style::Close : sf::Style::Fullscreen);\r
+               window_.Create(sf::VideoMode(screen_width_, screen_height_, 32), narrow(print()), config_.windowed ? sf::Style::Resize | sf::Style::Close : sf::Style::Fullscreen);\r
                window_.ShowMouseCursor(false);\r
                window_.SetPosition(screen_x_, screen_y_);\r
                window_.SetSize(screen_width_, screen_height_);\r
@@ -461,7 +461,7 @@ public:
                \r
        std::wstring print() const\r
        {       \r
-               return config_.name + channel_and_format();\r
+               return config_.name + L" " + channel_and_format();\r
        }\r
        \r
        void calculate_aspect()\r