Merge branch 'master' of https://github.com/ronag/Server into ronag-master

[casparcg] / shell / server.cpp

diff --git a/shell/server.cpp b/shell/server.cpp
index e09bf7430f4567f69c5c2bebbacb3e65aabb2224..cb000c4caa629154bd5a5900728064ae5db0e245 100644 (file)
--- a/shell/server.cpp
+++ b/shell/server.cpp
@@ -44,12 +44,14 @@
 #include <modules/flash/flash.h>\r
 #include <modules/portaudio/portaudio.h>\r
 #include <modules/ogl/ogl.h>\r
+#include <modules/newtek/newtek.h>\r
 #include <modules/silverlight/silverlight.h>\r
 #include <modules/image/image.h>\r
 #include <modules/image/consumer/image_consumer.h>\r
 \r
 #include <modules/portaudio/consumer/portaudio_consumer.h>\r
 #include <modules/bluefish/consumer/bluefish_consumer.h>\r
+#include <modules/newtek/consumer/newtek_consumer.h>\r
 #include <modules/decklink/consumer/decklink_consumer.h>\r
 #include <modules/decklink/consumer/blocking_decklink_consumer.h>\r
 #include <modules/ogl/consumer/ogl_consumer.h>\r
@@ -106,6 +108,9 @@ struct server::implementation : boost::noncopyable
                portaudio::init();\r
                CASPAR_LOG(info) << L"Initialized portaudio module.";\r
                                                          \r
+               newtek::init();\r
+               CASPAR_LOG(info) << L"Initialized newtek module.";\r
+\r
                ogl::init();              \r
                CASPAR_LOG(info) << L"Initialized ogl module.";\r
 \r
@@ -215,6 +220,8 @@ struct server::implementation : boost::noncopyable
                                        on_consumer(bluefish::create_consumer(xml_consumer.second));                                    \r
                                else if (name == L"decklink")                                   \r
                                        on_consumer(decklink::create_consumer(xml_consumer.second));                            \r
+                               else if (name == L"newtek")                                     \r
+                                       on_consumer(newtek::create_consumer(xml_consumer.second));                      \r
                                else if (name == L"blocking-decklink")\r
                                        on_consumer(decklink::create_blocking_consumer(xml_consumer.second));                           \r
                                else if (name == L"file" || name == L"stream")                                  \r