]> git.sesse.net Git - casparcg/commitdiff
Merged sending OSC for channel-grid channel as well.
authorHelge Norberg <helge.norberg@svt.se>
Tue, 25 Aug 2015 12:00:18 +0000 (14:00 +0200)
committerHelge Norberg <helge.norberg@svt.se>
Tue, 25 Aug 2015 12:00:18 +0000 (14:00 +0200)
shell/server.cpp

index 2f7609c05353f4eaaef2f99128513910442c21ad..57bd4fc86a2435eb877201ab9ff8393e97c71c3f 100644 (file)
@@ -241,8 +241,11 @@ struct server::impl : boost::noncopyable
                }
 
                // Dummy diagnostics channel
-               if(env::properties().get(L"configuration.channel-grid", false))
-                       channels_.push_back(spl::make_shared<video_channel>(static_cast<int>(channels_.size()+1), core::video_format_desc(core::video_format::x576p2500), accelerator_.create_image_mixer()));
+               if (env::properties().get(L"configuration.channel-grid", false))
+               {
+                       channels_.push_back(spl::make_shared<video_channel>(static_cast<int>(channels_.size() + 1), core::video_format_desc(core::video_format::x576p2500), accelerator_.create_image_mixer()));
+                       channels_.back()->monitor_output().attach_parent(monitor_subject_);
+               }
        }
 
        void setup_osc(const boost::property_tree::wptree& pt)