X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=shell%2Fserver.h;h=a8241813915836d0b5af3e223802fba288feb01a;hb=f529ebe9cc9c0a58a6ba4a1ebcd377b4dabf830a;hp=9e93dbc6c7f9585cf056d663092fe5d1bf7970f2;hpb=9cda7b764339f16ce7babe85e78c016a28bbfa1d;p=casparcg

diff --git a/shell/server.h b/shell/server.h
index 9e93dbc6c..a82418139 100644
--- a/shell/server.h
+++ b/shell/server.h
@@ -1,54 +1,52 @@
-/*
-* 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/spl/memory.h>
-
-#include <core/monitor/monitor.h>
-
-#include <boost/noncopyable.hpp>
-
-#include <vector>
-
-namespace caspar {
-
-namespace core {
-	class video_channel;
-}
-
-class server sealed : public monitor::observable
-					, boost::noncopyable
-{
-public:
-	server();
-	const std::vector<spl::shared_ptr<core::video_channel>> channels() const;
-
-	// monitor::observable
-
-	virtual void subscribe(const monitor::observable::observer_ptr& o) override;
-	virtual void unsubscribe(const monitor::observable::observer_ptr& o) override;
-private:
-	struct impl;
-	spl::shared_ptr<impl> impl_;
-};
-
+/*
+* 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