From: Helge Norberg <helge.norberg@gmail.com>
Date: Wed, 18 Jun 2014 13:36:06 +0000 (+0200)
Subject: Enabled use of streaming_consumer in casparcg.config
X-Git-Tag: 2.0.7_Beta2~8
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=cd2d863981dce2c0b8a7482a2e48a9ac49e1bdb2;hp=c2f884691b18efc01c6b2d5187840bbcbd86a177;p=casparcg

Enabled use of streaming_consumer in casparcg.config
---

diff --git a/shell/casparcg.config b/shell/casparcg.config
index 5d371ea5c..de4810b30 100644
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -108,6 +108,10 @@
                 <vcodec>libx264 [libx264|qtrle]</vcodec>
                 <separate-key>false [true|false]</separate-key>
             </file>
+            <stream>
+                <path></path>
+                <args></args>
+            </stream>
         </consumers>
     </channel>
 </channels>
diff --git a/shell/server.cpp b/shell/server.cpp
index 86b173615..ca89607c4 100644
--- a/shell/server.cpp
+++ b/shell/server.cpp
@@ -58,6 +58,7 @@
 #include <modules/decklink/consumer/blocking_decklink_consumer.h>
 #include <modules/ogl/consumer/ogl_consumer.h>
 #include <modules/ffmpeg/consumer/ffmpeg_consumer.h>
+#include <modules/ffmpeg/consumer/streaming_consumer.h>
 
 #include <protocol/amcp/AMCPProtocolStrategy.h>
 #include <protocol/cii/CIIProtocolStrategy.h>
@@ -270,8 +271,10 @@ struct server::implementation : boost::noncopyable
 					on_consumer(newtek::create_ivga_consumer(xml_consumer.second));			
 				else if (name == L"blocking-decklink")
 					on_consumer(decklink::create_blocking_consumer(xml_consumer.second));				
-				else if (name == L"file" || name == L"stream")					
+				else if (name == L"file")					
 					on_consumer(ffmpeg::create_consumer(xml_consumer.second));						
+				else if (name == L"stream")					
+					on_consumer(ffmpeg::create_streaming_consumer(xml_consumer.second));						
 				else if (name == L"system-audio")
 					on_consumer(oal::create_consumer());
 				else if (name != L"<xmlcomment>")