2.0.0.2: - ogl_device: No longer monostate.

[casparcg] / shell / server.cpp

diff --git a/shell/server.cpp b/shell/server.cpp
index 5ed616e69414ca0b36989d6455815d9c6a874be2..204e54dd33d5d94152edbc5181cd5f95b9f69b80 100644 (file)
--- a/shell/server.cpp
+++ b/shell/server.cpp
@@ -24,6 +24,7 @@
 #include <common/exception/exceptions.h>\r
 #include <common/utility/string.h>\r
 \r
+#include <core/mixer/gpu/ogl_device.h>\r
 #include <core/channel.h>\r
 \r
 #include <modules/bluefish/bluefish.h>\r
@@ -58,10 +59,12 @@ namespace caspar {
 using namespace core;\r
 using namespace protocol;\r
 \r
+\r
 struct server::implementation : boost::noncopyable\r
 {\r
        std::vector<safe_ptr<IO::AsyncEventServer>> async_servers_;     \r
-       std::vector<safe_ptr<channel>> channels_;\r
+       std::vector<safe_ptr<channel>>                          channels_;\r
+       safe_ptr<ogl_device>                                            ogl_;\r
 \r
        implementation()                                                                                                \r
        {                       \r
@@ -71,7 +74,7 @@ struct server::implementation : boost::noncopyable
                init_flash();\r
                init_oal();\r
                init_ogl();\r
-               init_silverlight();\r
+               //init_silverlight();\r
                init_image();\r
 \r
                setup_channels(env::properties());\r
@@ -91,39 +94,28 @@ struct server::implementation : boost::noncopyable
                {               \r
                        auto format_desc = video_format_desc::get(widen(xml_channel.second.get("videomode", "PAL")));           \r
                        if(format_desc.format == video_format::invalid)\r
-                               BOOST_THROW_EXCEPTION(caspar_exception() << msg_info("Invalid videomode."));\r
+                               BOOST_THROW_EXCEPTION(caspar_exception() << msg_info("Invalid video-mode."));\r
                        \r
-                       channels_.push_back(channel(channels_.size(), format_desc));\r
+                       channels_.push_back(channel(channels_.size(), format_desc, ogl_));\r
                        \r
                        int index = 0;\r
                        BOOST_FOREACH(auto& xml_consumer, xml_channel.second.get_child("consumers"))\r
                        {\r
                                try\r
                                {\r
-                                       std::string name = xml_consumer.first;\r
+                                       const std::string name = xml_consumer.first;\r
                                        if(name == "ogl")\r
-                                       {                       \r
-                                               int device = xml_consumer.second.get("device", 0);\r
-                       \r
-                                               stretch stretch = stretch::fill;\r
-                                               std::string stretchStr = xml_consumer.second.get("stretch", "");\r
-                                               if(stretchStr == "none")\r
-                                                       stretch = stretch::none;\r
-                                               else if(stretchStr == "uniform")\r
-                                                       stretch = stretch::uniform;\r
-                                               else if(stretchStr == "uniformtofill")\r
-                                                       stretch = stretch::uniform_to_fill;\r
-\r
-                                               bool windowed = xml_consumer.second.get("windowed", false);\r
-                                               channels_.back()->consumer()->add(index++, ogl_consumer(device, stretch, windowed));\r
-                                       }\r
+                                               channels_.back()->consumer()->add(index++, create_ogl_consumer(xml_consumer.second));                                   \r
                                        else if(name == "bluefish")                                     \r
-                                               channels_.back()->consumer()->add(index++, bluefish_consumer(xml_consumer.second.get("device", 0), \r
-                                                                                                                                                                       xml_consumer.second.get("embedded-audio", true)));                                      \r
+                                               channels_.back()->consumer()->add(index++, create_bluefish_consumer(xml_consumer.second));                                      \r
                                        else if(name == "decklink")                                     \r
-                                               channels_.back()->consumer()->add(index++, create_decklink_consumer(xml_consumer.second));                                      \r
+                                               channels_.back()->consumer()->add(index++, create_decklink_consumer(xml_consumer.second));                              \r
+                                       else if(name == "file")                                 \r
+                                               channels_.back()->consumer()->add(index++, create_ffmpeg_consumer(xml_consumer.second));                                                \r
                                        else if(name == "audio")\r
-                                               channels_.back()->consumer()->add(index++, oal_consumer());                     \r
+                                               channels_.back()->consumer()->add(index++, oal_consumer());             \r
+                                       else if(name != "<xmlcomment>")\r
+                                               CASPAR_LOG(warning) << "Invalid consumer: " << widen(name);     \r
                                }\r
                                catch(...)\r
                                {\r
@@ -151,7 +143,7 @@ struct server::implementation : boost::noncopyable
                                        async_servers_.push_back(asyncbootstrapper);\r
                                }\r
                                else\r
-                                       BOOST_THROW_EXCEPTION(caspar_exception() << arg_name_info(name) << msg_info("Invalid controller."));\r
+                                       CASPAR_LOG(warning) << "Invalid controller: " << widen(name);   \r
                        }\r
                        catch(...)\r
                        {\r