X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=shell%2Fserver.cpp;h=5d9bf906f80ffbf8e496804fa7c1b7a1b1030ff7;hb=ac7b3acb915f90de6b224e54a2240023fc221e5a;hp=b121b809819c43776d951fd00d19f20f75717842;hpb=e59ee903385d31db9a4fc928f32d3be5322b3389;p=casparcg

diff --git a/shell/server.cpp b/shell/server.cpp
index b121b8098..5d9bf906f 100644
--- a/shell/server.cpp
+++ b/shell/server.cpp
@@ -68,14 +68,14 @@ struct server::implementation : boost::noncopyable
 
 	implementation()												
 	{			
-		init_ffmpeg();
-		init_bluefish();
-		init_decklink();
-		init_flash();
-		init_oal();
-		init_ogl();
+		ffmpeg::init();
+		bluefish::init();
+		decklink::init();
+		flash::init();
+		oal::init();
+		ogl::init();
 		//init_silverlight();
-		init_image();
+		image::init();
 
 		setup_channels(env::properties());
 		setup_controllers(env::properties());
@@ -83,7 +83,7 @@ struct server::implementation : boost::noncopyable
 
 	~implementation()
 	{		
-		uninit_ffmpeg();
+		ffmpeg::uninit();
 
 		async_servers_.clear();
 		channels_.clear();
@@ -107,15 +107,15 @@ struct server::implementation : boost::noncopyable
 				{
 					const std::string name = xml_consumer.first;
 					if(name == "screen")
-						channels_.back()->output()->add(index++, create_ogl_consumer(xml_consumer.second));					
+						channels_.back()->output()->add(index++, ogl::create_consumer(xml_consumer.second));					
 					else if(name == "bluefish")					
-						channels_.back()->output()->add(index++, create_bluefish_consumer(xml_consumer.second));					
+						channels_.back()->output()->add(index++, bluefish::create_consumer(xml_consumer.second));					
 					else if(name == "decklink")					
-						channels_.back()->output()->add(index++, create_decklink_consumer(xml_consumer.second));				
+						channels_.back()->output()->add(index++, decklink::create_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++, create_oal_consumer());		
+						channels_.back()->output()->add(index++, oal::create_consumer());		
 					else if(name != "<xmlcomment>")
 						CASPAR_LOG(warning) << "Invalid consumer: " << widen(name);	
 				}