Enabled use of streaming_consumer in casparcg.config

diff --git a/shell/casparcg.config b/shell/casparcg.config
index 5d371ea5c420d7c9724e029d35928797a3a28e58..de4810b301eca3c59fe250122a79c7880fdedddb 100644 (file)
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -108,6 +108,10 @@
                 <vcodec>libx264 [libx264|qtrle]</vcodec>\r
                 <separate-key>false [true|false]</separate-key>\r
             </file>\r
+            <stream>\r
+                <path></path>\r
+                <args></args>\r
+            </stream>\r
         </consumers>\r
     </channel>\r
 </channels>\r

diff --git a/shell/server.cpp b/shell/server.cpp
index 86b1736157d75f0902e11f410d723caec961e5a4..ca89607c41df5e7e3e439251f7d123c36a64f7c2 100644 (file)
--- a/shell/server.cpp
+++ b/shell/server.cpp
@@ -58,6 +58,7 @@
 #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
@@ -270,8 +271,10 @@ struct server::implementation : boost::noncopyable
                                        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"<xmlcomment>")\r