2.0. decklink_producer: Fixed audio regression bug. Improved params. Added nb_frames...

[casparcg] / shell / server.cpp

diff --git a/shell/server.cpp b/shell/server.cpp
index bbade5ce39ef39b1f7a1c47af087a03c371d07a5..b121b809819c43776d951fd00d19f20f75717842 100644 (file)
--- a/shell/server.cpp
+++ b/shell/server.cpp
@@ -26,6 +26,8 @@
 \r
 #include <core/mixer/gpu/ogl_device.h>\r
 #include <core/video_channel.h>\r
+#include <core/producer/stage.h>\r
+#include <core/consumer/output.h>\r
 \r
 #include <modules/bluefish/bluefish.h>\r
 #include <modules/decklink/decklink.h>\r
@@ -49,7 +51,6 @@
 \r
 #include <boost/algorithm/string.hpp>\r
 #include <boost/lexical_cast.hpp>\r
-#include <boost/filesystem.hpp>\r
 #include <boost/foreach.hpp>\r
 #include <boost/property_tree/ptree.hpp>\r
 #include <boost/property_tree/xml_parser.hpp>\r
@@ -59,11 +60,10 @@ 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<video_channel>>                            channels_;\r
+       std::vector<safe_ptr<video_channel>>            channels_;\r
        ogl_device                                                                      ogl_;\r
 \r
        implementation()                                                                                                \r
@@ -82,7 +82,9 @@ struct server::implementation : boost::noncopyable
        }\r
 \r
        ~implementation()\r
-       {                               \r
+       {               \r
+               uninit_ffmpeg();\r
+\r
                async_servers_.clear();\r
                channels_.clear();\r
        }\r
@@ -105,15 +107,15 @@ struct server::implementation : boost::noncopyable
                                {\r
                                        const std::string name = xml_consumer.first;\r
                                        if(name == "screen")\r
-                                               channels_.back()->consumer()->add(index++, create_ogl_consumer(xml_consumer.second));                                   \r
+                                               channels_.back()->output()->add(index++, create_ogl_consumer(xml_consumer.second));                                     \r
                                        else if(name == "bluefish")                                     \r
-                                               channels_.back()->consumer()->add(index++, create_bluefish_consumer(xml_consumer.second));                                      \r
+                                               channels_.back()->output()->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()->output()->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
+                                       //      channels_.back()->output()->add(index++, create_ffmpeg_consumer(xml_consumer.second));                                          \r
                                        else if(name == "audio")\r
-                                               channels_.back()->consumer()->add(index++, make_safe<oal_consumer>());          \r
+                                               channels_.back()->output()->add(index++, create_oal_consumer());                \r
                                        else if(name != "<xmlcomment>")\r
                                                CASPAR_LOG(warning) << "Invalid consumer: " << widen(name);     \r
                                }\r