git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

[casparcg] / modules / ogl / consumer / ogl_consumer.cpp

diff --git a/modules/ogl/consumer/ogl_consumer.cpp b/modules/ogl/consumer/ogl_consumer.cpp
index 11c90d435590449c8720cc6d971784c1d9111020..0f98c7db2449551f58fad7cc74048644f8a658ce 100644 (file)
--- a/modules/ogl/consumer/ogl_consumer.cpp
+++ b/modules/ogl/consumer/ogl_consumer.cpp
@@ -66,7 +66,7 @@ extern "C"
 #pragma warning (pop)\r
 #endif\r
 \r
-namespace caspar {\r
+namespace caspar { namespace ogl {\r
                \r
 enum stretch\r
 {\r
@@ -81,15 +81,15 @@ struct configuration
        size_t          screen_index;\r
        stretch         stretch;\r
        bool            windowed;\r
-       bool            key_only;\r
        bool            auto_deinterlace;\r
+       bool            key_only;\r
 \r
        configuration()\r
                : screen_index(0)\r
                , stretch(fill)\r
                , windowed(true)\r
-               , key_only(false)\r
                , auto_deinterlace(true)\r
+               , key_only(false)\r
        {\r
        }\r
 };\r
@@ -123,7 +123,7 @@ struct ogl_consumer : boost::noncopyable
        tbb::atomic<bool>               is_running_;\r
 \r
        \r
-       filter                                  filter_;\r
+       ffmpeg::filter                  filter_;\r
 public:\r
        ogl_consumer(const configuration& config, const core::video_format_desc& format_desc) \r
                : config_(config)\r
@@ -134,7 +134,6 @@ public:
                , screen_height_(format_desc.height)\r
                , square_width_(format_desc.square_width)\r
                , square_height_(format_desc.square_height)\r
-               , graph_(diagnostics::create_graph(narrow(print())))\r
                , input_buffer_(core::consumer_buffer_depth()-1)\r
                , filter_(format_desc.field_mode == core::field_mode::progressive || !config.auto_deinterlace ? L"" : L"YADIF=0:-1", boost::assign::list_of(PIX_FMT_BGRA))\r
        {               \r
@@ -143,6 +142,8 @@ public:
                graph_->add_guide("frame-time", 0.5);\r
                graph_->set_color("frame-time", diagnostics::color(1.0f, 0.0f, 0.0f));\r
                graph_->set_color("dropped-frame", diagnostics::color(0.3f, 0.6f, 0.3f));\r
+               graph_->set_text(print());\r
+               diagnostics::register_graph(graph_);\r
                                                                        \r
                DISPLAY_DEVICE d_device = {sizeof(d_device), 0};                        \r
                std::vector<DISPLAY_DEVICE> displayDevices;\r
@@ -463,7 +464,7 @@ public:
        }\r
 };     \r
 \r
-safe_ptr<core::frame_consumer> create_ogl_consumer(const std::vector<std::wstring>& params)\r
+safe_ptr<core::frame_consumer> create_consumer(const std::vector<std::wstring>& params)\r
 {\r
        if(params.size() < 1 || params[0] != L"SCREEN")\r
                return core::frame_consumer::empty();\r
@@ -481,7 +482,7 @@ safe_ptr<core::frame_consumer> create_ogl_consumer(const std::vector<std::wstrin
        return make_safe<ogl_consumer_proxy>(config);\r
 }\r
 \r
-safe_ptr<core::frame_consumer> create_ogl_consumer(const boost::property_tree::ptree& ptree) \r
+safe_ptr<core::frame_consumer> create_consumer(const boost::property_tree::ptree& ptree) \r
 {\r
        configuration config;\r
        config.screen_index             = ptree.get("device",   config.screen_index);\r
@@ -498,4 +499,4 @@ safe_ptr<core::frame_consumer> create_ogl_consumer(const boost::property_tree::p
        return make_safe<ogl_consumer_proxy>(config);\r
 }\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file