2.0. Fixed rendering stalls caused by ogl frame allocation delays.

[casparcg] / shell / server.h

diff --git a/shell/server.h b/shell/server.h
index 43edc98dd18754ac5273b36bfbbdd8e0477989cf..53b2c66c53a8bb676c70ae0c515a9d3e3ea09ac9 100644 (file)
--- a/shell/server.h
+++ b/shell/server.h
@@ -1,8 +1,26 @@
-#pragma once\r
+/*\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
-#include <core/channel.h>\r
+#pragma once\r
 \r
-#include <common/exception/exceptions.h>\r
+#include <common/memory/safe_ptr.h>\r
 \r
 #include <boost/noncopyable.hpp>\r
 \r
@@ -10,20 +28,18 @@
 \r
 namespace caspar {\r
 \r
-std::vector<safe_ptr<core::channel>> initialize_channels();\r
-       \r
-struct invalid_bootstrapper : virtual boost::exception, virtual std::exception {};\r
+namespace core {\r
+       class video_channel;\r
+}\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
+       const std::vector<safe_ptr<core::video_channel>> get_channels() const;\r
 private:\r
        struct implementation;\r
-       std::shared_ptr<implementation> impl_;\r
+       safe_ptr<implementation> impl_;\r
 };\r
 \r
 }
\ No newline at end of file