- Enabled a single instance of decklink_consumer to manage a separate key output...

[casparcg] / shell / server.cpp

diff --git a/shell/server.cpp b/shell/server.cpp
index 8e38b088d605deacf544723e828a4ae669a1fbfa..86b1736157d75f0902e11f410d723caec961e5a4 100644 (file)
--- a/shell/server.cpp
+++ b/shell/server.cpp
@@ -35,7 +35,6 @@
 #include <core/video_channel.h>\r
 #include <core/producer/stage.h>\r
 #include <core/consumer/output.h>\r
-#include <core/consumer/synchronizing/synchronizing_consumer.h>\r
 #include <core/thumbnail_generator.h>\r
 #include <core/producer/media_info/media_info.h>\r
 #include <core/producer/media_info/media_info_repository.h>\r
@@ -45,6 +44,7 @@
 #include <modules/decklink/decklink.h>\r
 #include <modules/ffmpeg/ffmpeg.h>\r
 #include <modules/flash/flash.h>\r
+#include <modules/html/html.h>\r
 #include <modules/oal/oal.h>\r
 #include <modules/ogl/ogl.h>\r
 #include <modules/newtek/newtek.h>\r
@@ -129,6 +129,9 @@ struct server::implementation : boost::noncopyable
        {\r
                running_ = true;\r
                setup_audio(env::properties());\r
+               \r
+               html::init();\r
+               CASPAR_LOG(info) << L"Initialized html module.";\r
 \r
                ffmpeg::init(media_info_repo_);\r
                CASPAR_LOG(info) << L"Initialized ffmpeg module.";\r
@@ -179,6 +182,7 @@ struct server::implementation : boost::noncopyable
                destroy_producers_synchronously();\r
                channels_.clear();\r
 \r
+               html::uninit();\r
                ffmpeg::uninit();\r
        }\r
 \r
@@ -228,7 +232,10 @@ struct server::implementation : boost::noncopyable
 \r
                // Dummy diagnostics channel\r
                if(env::properties().get(L"configuration.channel-grid", false))\r
+               {\r
                        channels_.push_back(make_safe<video_channel>(channels_.size()+1, core::video_format_desc::get(core::video_format::x576p2500), ogl_, default_channel_layout_repository().get_by_name(L"STEREO")));\r
+                       channels_.back()->monitor_output().attach_parent(monitor_subject_);\r
+               }\r
        }\r
 \r
        template<typename Base>\r
@@ -267,10 +274,6 @@ struct server::implementation : boost::noncopyable
                                        on_consumer(ffmpeg::create_consumer(xml_consumer.second));                                              \r
                                else if (name == L"system-audio")\r
                                        on_consumer(oal::create_consumer());\r
-                               else if (name == L"synchronizing")\r
-                                       on_consumer(make_safe<core::synchronizing_consumer>(\r
-                                                       create_consumers<core::frame_consumer>(\r
-                                                                       xml_consumer.second)));\r
                                else if (name != L"<xmlcomment>")\r
                                        CASPAR_LOG(warning) << "Invalid consumer: " << widen(name);     \r
                        }\r