X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=shell%2Fserver.h;h=a8241813915836d0b5af3e223802fba288feb01a;hb=61974506572c47b0650c4b5bfa65cd18621d5fec;hp=d73088611735bcd8e9bda790f9bb09f195381dba;hpb=52b74f3c499e70dc74e9f926b4783968b012cd37;p=casparcg

diff --git a/shell/server.h b/shell/server.h
index d73088611..a82418139 100644
--- a/shell/server.h
+++ b/shell/server.h
@@ -1,49 +1,52 @@
-/*
-* copyright (c) 2010 Sveriges Television AB <info@casparcg.com>
-*
-*  This file is part of CasparCG.
-*
-*    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/>.
-*
-*/
-
-#pragma once
-
-#include <core/channel.h>
-
-#include <common/exception/exceptions.h>
-
-#include <boost/noncopyable.hpp>
-
-#include <vector>
-
-namespace caspar {
-
-std::vector<safe_ptr<core::channel>> initialize_channels();
-	
-struct invalid_bootstrapper : virtual boost::exception, virtual std::exception {};
-
-class server : boost::noncopyable
-{
-public:
-	server();
-
-	const std::vector<safe_ptr<core::channel>> get_channels() const;
-
-private:
-	struct implementation;
-	std::shared_ptr<implementation> 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