2.0. Updated namespaces.

[casparcg] / shell / server.h

diff --git a/shell/server.h b/shell/server.h
index d73088611735bcd8e9bda790f9bb09f195381dba..53b2c66c53a8bb676c70ae0c515a9d3e3ea09ac9 100644 (file)
--- a/shell/server.h
+++ b/shell/server.h
@@ -20,9 +20,7 @@
 \r
 #pragma once\r
 \r
-#include <core/channel.h>\r
-\r
-#include <common/exception/exceptions.h>\r
+#include <common/memory/safe_ptr.h>\r
 \r
 #include <boost/noncopyable.hpp>\r
 \r
@@ -30,20 +28,18 @@
 \r
 namespace caspar {\r
 \r
-std::vector<safe_ptr<core::channel>> initialize_channels();\r
-       \r
-struct invalid_bootstrapper : virtual boost::exception, virtual std::exception {};\r
+namespace core {\r
+       class video_channel;\r
+}\r
 \r
 class server : boost::noncopyable\r
 {\r
 public:\r
        server();\r
-\r
-       const std::vector<safe_ptr<core::channel>> get_channels() const;\r
-\r
+       const std::vector<safe_ptr<core::video_channel>> get_channels() const;\r
 private:\r
        struct implementation;\r
-       std::shared_ptr<implementation> impl_;\r
+       safe_ptr<implementation> impl_;\r
 };\r
 \r
 }
\ No newline at end of file