2.0.0.2:

[casparcg] / core / server.cpp

diff --git a/core/server.cpp b/core/server.cpp
index 7bcb551f94f22a712376ffbf8c8182128286520a..3e62f131ec339ae6ca5b4abbc2208dc3f3e6d83c 100644 (file)
--- a/core/server.cpp
+++ b/core/server.cpp
@@ -1,6 +1,7 @@
 #include "StdAfx.h"\r
 \r
 #include "server.h"\r
+#include "channel.h"\r
 \r
 #include "consumer/oal/oal_consumer.h"\r
 #ifndef DISABLE_BLUEFISH\r
@@ -24,6 +25,10 @@
 #include <boost/property_tree/ptree.hpp>\r
 #include <boost/property_tree/xml_parser.hpp>\r
 \r
+#include "producer/frame_producer_device.h"\r
+#include "consumer/frame_consumer_device.h"\r
+#include "processor/frame_processor_device.h"\r
+\r
 namespace caspar { namespace core {\r
 \r
 struct server::implementation : boost::noncopyable\r
@@ -111,7 +116,10 @@ struct server::implementation : boost::noncopyable
                                }\r
                        }\r
                        \r
-                       channels_.push_back(std::make_shared<renderer::render_device>(format_desc, consumers));\r
+                       auto processor_device = std::make_shared<frame_processor_device>(format_desc);\r
+                       auto producer_device = std::make_shared<frame_producer_device>(processor_device);\r
+                       auto consumer_device = std::make_shared<frame_consumer_device>(processor_device, format_desc, consumers);\r
+                       channels_.push_back(std::make_shared<channel>(producer_device, processor_device, consumer_device));\r
                }\r
        }\r
                \r
@@ -139,7 +147,6 @@ struct server::implementation : boost::noncopyable
                        catch(...)\r
                        {\r
                                CASPAR_LOG_CURRENT_EXCEPTION();\r
-                               throw;\r
                        }\r
                }\r
        }\r
@@ -157,8 +164,8 @@ struct server::implementation : boost::noncopyable
        }\r
 \r
        std::vector<IO::AsyncEventServerPtr> async_servers_;\r
-\r
-       std::vector<renderer::render_device_ptr> channels_;\r
+       \r
+       std::vector<channel_ptr> channels_;\r
 \r
        int logLevel_;\r
 \r
@@ -199,6 +206,8 @@ const std::wstring& server::data_folder()
        return server::implementation::data_folder_;\r
 }\r
 \r
-const std::vector<renderer::render_device_ptr>& server::get_channels() const{ return impl_->channels_; }\r
-\r
+const std::vector<channel_ptr> server::get_channels() const\r
+{\r
+       return impl_->channels_;\r
+}\r
 }}
\ No newline at end of file