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

[casparcg] / shell / main.cpp

diff --git a/shell/main.cpp b/shell/main.cpp
index 4dafde22c66fb7865afa03c1ceda8eb7fdada841..de925251b8210c0357361570d68c833c90b2e0c7 100644 (file)
--- a/shell/main.cpp
+++ b/shell/main.cpp
@@ -46,6 +46,7 @@
 #include <atlbase.h>\r
 \r
 #include <protocol/amcp/AMCPProtocolStrategy.h>\r
+#include <protocol/osc/server.h>\r
 \r
 #include <modules/bluefish/bluefish.h>\r
 #include <modules/decklink/decklink.h>\r
@@ -267,6 +268,7 @@ int main(int argc, wchar_t* argv[])
 \r
                        // Create server object which initializes channels, protocols and controllers.\r
                        caspar::server caspar_server(shutdown_server_now);\r
+                       \r
 \r
                        // Use separate thread for the blocking console input, will be terminated \r
                        // anyway when the main thread terminates.\r