2.1.0: changed "const_array" and "mutable_array" into generic "array" with const...

[casparcg] / shell / server.h

diff --git a/shell/server.h b/shell/server.h
index 74a6fda4feb3822edea4acd5212794e37166d67b..9e93dbc6c7f9585cf056d663092fe5d1bf7970f2 100644 (file)
--- a/shell/server.h
+++ b/shell/server.h
@@ -23,6 +23,8 @@
 \r
 #include <common/spl/memory.h>\r
 \r
+#include <core/monitor/monitor.h>\r
+\r
 #include <boost/noncopyable.hpp>\r
 \r
 #include <vector>\r
@@ -33,11 +35,17 @@ namespace core {
        class video_channel;\r
 }\r
 \r
-class server sealed : boost::noncopyable\r
+class server sealed : public monitor::observable\r
+                                       , boost::noncopyable\r
 {\r
 public:\r
        server();\r
-       const std::vector<spl::shared_ptr<core::video_channel>> get_channels() const;\r
+       const std::vector<spl::shared_ptr<core::video_channel>> channels() const;\r
+\r
+       // monitor::observable\r
+\r
+       virtual void subscribe(const monitor::observable::observer_ptr& o) override;\r
+       virtual void unsubscribe(const monitor::observable::observer_ptr& o) override;\r
 private:\r
        struct impl;\r
        spl::shared_ptr<impl> impl_;\r