]> git.sesse.net Git - casparcg/commitdiff
3572363: Modified title of screen consumer windows
authorhellgore <hellgore@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Wed, 13 Feb 2013 15:39:05 +0000 (15:39 +0000)
committerhellgore <hellgore@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Wed, 13 Feb 2013 15:39:05 +0000 (15:39 +0000)
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/trunk@3754 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

modules/ogl/consumer/ogl_consumer.cpp

index a44029ce954a8c132d3799b92e0eb1ae63dd11ad..f3813637023b9a66a76c2ae40d997b4461ff1261 100644 (file)
@@ -211,7 +211,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(print()), config_.windowed ? sf::Style::Resize | sf::Style::Close : sf::Style::Fullscreen);\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_.ShowMouseCursor(false);\r
                window_.SetPosition(screen_x_, screen_y_);\r
                window_.SetSize(screen_width_, screen_height_);\r
@@ -443,10 +443,15 @@ public:
 \r
                return wrap_as_future(is_running_.load());\r
        }\r
+\r
+       std::wstring channel_and_format() const\r
+       {\r
+               return L"[" + boost::lexical_cast<std::wstring>(channel_index_) + L"|" + format_desc_.name + L"]";\r
+       }\r
                \r
        std::wstring print() const\r
        {       \r
-               return config_.name + L"[" + boost::lexical_cast<std::wstring>(channel_index_) + L"|" + format_desc_.name + L"]";\r
+               return config_.name + channel_and_format();\r
        }\r
        \r
        void calculate_aspect()\r