[polling_filesystem_monitor] Fixed bug where unallocated memory could be read by...

[casparcg] / shell / server.h

diff --git a/shell/server.h b/shell/server.h
index fb4917cfff61e96061209a6eb5f1ccec8e2abc22..a8241813915836d0b5af3e223802fba288feb01a 100644 (file)
--- a/shell/server.h
+++ b/shell/server.h
@@ -1,45 +1,52 @@
-/*\r
-* copyright (c) 2010 Sveriges Television AB <info@casparcg.com>\r
-*\r
-*  This file is part of CasparCG.\r
-*\r
-*    CasparCG is free software: you can redistribute it and/or modify\r
-*    it under the terms of the GNU General Public License as published by\r
-*    the Free Software Foundation, either version 3 of the License, or\r
-*    (at your option) any later version.\r
-*\r
-*    CasparCG is distributed in the hope that it will be useful,\r
-*    but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
-*    GNU General Public License for more details.\r
-\r
-*    You should have received a copy of the GNU General Public License\r
-*    along with CasparCG.  If not, see <http://www.gnu.org/licenses/>.\r
-*\r
-*/\r
-\r
-#pragma once\r
-\r
-#include <core/channel.h>\r
-\r
-#include <common/exception/exceptions.h>\r
-\r
-#include <boost/noncopyable.hpp>\r
-\r
-#include <vector>\r
-\r
-namespace caspar {\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
-private:\r
-       struct implementation;\r
-       std::shared_ptr<implementation> impl_;\r
-};\r
-\r
+/*
+* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>
+*
+* This file is part of CasparCG (www.casparcg.com).
+*
+* CasparCG is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* CasparCG is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with CasparCG. If not, see <http://www.gnu.org/licenses/>.
+*
+* Author: Robert Nagy, ronag89@gmail.com
+*/
+
+#pragma once
+
+#include <common/memory.h>
+#include <common/future_fwd.h>
+
+#include <core/monitor/monitor.h>
+#include <core/fwd.h>
+
+#include <boost/noncopyable.hpp>
+
+#include <vector>
+
+FORWARD3(caspar, protocol, amcp, class amcp_command_repository);
+
+namespace caspar {
+
+class server final : public boost::noncopyable
+{
+public:
+       explicit server(std::promise<bool>& shutdown_server_now);
+       void start();
+       spl::shared_ptr<core::system_info_provider_repository> get_system_info_provider_repo() const;
+       spl::shared_ptr<protocol::amcp::amcp_command_repository> get_amcp_command_repository() const;
+
+       core::monitor::subject& monitor_output();
+private:
+       struct impl;
+       spl::shared_ptr<impl> impl_;
+};
+
 }
\ No newline at end of file