X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=shell%2Fserver.cpp;h=b121b809819c43776d951fd00d19f20f75717842;hb=91e4e2447a146d10e1dcb5565369b14b5eabac66;hp=dabcccb921e48c49b2cb5e6d47327b91106df0e8;hpb=3605352ab9396a593cc7d1a95bcb556d57591e02;p=casparcg

diff --git a/shell/server.cpp b/shell/server.cpp
index dabcccb92..b121b8098 100644
--- a/shell/server.cpp
+++ b/shell/server.cpp
@@ -51,7 +51,6 @@
 
 #include <boost/algorithm/string.hpp>
 #include <boost/lexical_cast.hpp>
-#include <boost/filesystem.hpp>
 #include <boost/foreach.hpp>
 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/xml_parser.hpp>
@@ -61,11 +60,10 @@ namespace caspar {
 using namespace core;
 using namespace protocol;
 
-
 struct server::implementation : boost::noncopyable
 {
 	std::vector<safe_ptr<IO::AsyncEventServer>> async_servers_;	
-	std::vector<safe_ptr<video_channel>>				channels_;
+	std::vector<safe_ptr<video_channel>>		channels_;
 	ogl_device									ogl_;
 
 	implementation()												
@@ -114,10 +112,10 @@ struct server::implementation : boost::noncopyable
 						channels_.back()->output()->add(index++, create_bluefish_consumer(xml_consumer.second));					
 					else if(name == "decklink")					
 						channels_.back()->output()->add(index++, create_decklink_consumer(xml_consumer.second));				
-					else if(name == "file")					
-						channels_.back()->output()->add(index++, create_ffmpeg_consumer(xml_consumer.second));						
+					//else if(name == "file")					
+					//	channels_.back()->output()->add(index++, create_ffmpeg_consumer(xml_consumer.second));						
 					else if(name == "audio")
-						channels_.back()->output()->add(index++, make_safe<oal_consumer>());		
+						channels_.back()->output()->add(index++, create_oal_consumer());		
 					else if(name != "<xmlcomment>")
 						CASPAR_LOG(warning) << "Invalid consumer: " << widen(name);	
 				}