]> git.sesse.net Git - casparcg/commitdiff
removed include
authorHelge Norberg <helge.norberg@gmail.com>
Tue, 28 May 2013 10:30:45 +0000 (12:30 +0200)
committerHelge Norberg <helge.norberg@gmail.com>
Tue, 28 May 2013 10:30:45 +0000 (12:30 +0200)
shell/server.cpp

index 5cdff2899dcba0381a50b8f393e0427bbf22c698..633b0c45729d146e6b16a744ad20ebc9561a0731 100644 (file)
@@ -34,7 +34,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
 \r
 #include <modules/bluefish/bluefish.h>\r
@@ -166,17 +165,11 @@ struct server::implementation : boost::noncopyable
                                {\r
                                        channels_.back()->output()->add(consumer);\r
                                });\r
-\r
-                       // Add all consumers before starting channel.\r
-                       channels_.back()->start_channel();\r
                }\r
 \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()->start_channel();\r
-               }\r
        }\r
 \r
        template<typename Base>\r
@@ -210,8 +203,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>(create_consumers<core::synchronizable_consumer>(xml_consumer.second)));\r
                                else if (name != L"<xmlcomment>")\r
                                        CASPAR_LOG(warning) << "Invalid consumer: " << widen(name);     \r
                        }\r