#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
#include <modules/oal/oal.h>\r
#include <modules/ogl/ogl.h>\r
#include <modules/newtek/newtek.h>\r
-#include <modules/silverlight/silverlight.h>\r
#include <modules/image/image.h>\r
#include <modules/image/consumer/image_consumer.h>\r
\r
#include <modules/decklink/consumer/blocking_decklink_consumer.h>\r
#include <modules/ogl/consumer/ogl_consumer.h>\r
#include <modules/ffmpeg/consumer/ffmpeg_consumer.h>\r
+#include <modules/ffmpeg/consumer/streaming_consumer.h>\r
\r
#include <protocol/amcp/AMCPProtocolStrategy.h>\r
#include <protocol/cii/CIIProtocolStrategy.h>\r
{\r
running_ = true;\r
setup_audio(env::properties());\r
-\r
+ \r
ffmpeg::init(media_info_repo_);\r
CASPAR_LOG(info) << L"Initialized ffmpeg module.";\r
\r
\r
~implementation()\r
{\r
+ diagnostics::show_graphs(false);\r
running_ = false;\r
initial_media_info_thread_.join();\r
thumbnail_generator_.reset();\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()->monitor_output().attach_parent(monitor_subject_);\r
+ }\r
}\r
\r
template<typename Base>\r
on_consumer(newtek::create_ivga_consumer(xml_consumer.second)); \r
else if (name == L"blocking-decklink")\r
on_consumer(decklink::create_blocking_consumer(xml_consumer.second)); \r
- else if (name == L"file" || name == L"stream") \r
+ else if (name == L"file") \r
on_consumer(ffmpeg::create_consumer(xml_consumer.second)); \r
+ else if (name == L"stream") \r
+ on_consumer(ffmpeg::create_streaming_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