2.0. Updated namespaces.

[casparcg] / shell / server.cpp

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