set svn:eol-style native on .h and .cpp files

[casparcg] / shell / server.h

diff --git a/shell/server.h b/shell/server.h
index 74571dbf00c4708330e8c4fe6be979db593931c2..aecb7ebdfb86d86f493ae8027873f88c5c79edd7 100644 (file)
--- a/shell/server.h
+++ b/shell/server.h
@@ -1,54 +1,54 @@
-/*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
-*\r
-* This file is part of CasparCG (www.casparcg.com).\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
-* Author: Robert Nagy, ronag89@gmail.com\r
-*/\r
-\r
-#pragma once\r
-\r
-#include <common/memory.h>\r
-\r
-#include <core/monitor/monitor.h>\r
-\r
-#include <boost/noncopyable.hpp>\r
-\r
-#include <vector>\r
-\r
-namespace caspar {\r
-\r
-namespace core {\r
-       class video_channel;\r
-}\r
-\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>> channels() const;\r
-\r
-       // monitor::observable\r
-\r
-       void subscribe(const monitor::observable::observer_ptr& o) override;\r
-       void unsubscribe(const monitor::observable::observer_ptr& o) override;\r
-private:\r
-       struct impl;\r
-       spl::shared_ptr<impl> 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 <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
+
+       void subscribe(const monitor::observable::observer_ptr& o) override;
+       void unsubscribe(const monitor::observable::observer_ptr& o) override;
+private:
+       struct impl;
+       spl::shared_ptr<impl> impl_;
+};
+
 }
\ No newline at end of file