Merge branch 'master' of https://github.com/ronag/Server into master

[casparcg] / core / producer / layer.h

diff --git a/core/producer/layer.h b/core/producer/layer.h
index b5281ff018f33a4e52d11c08589f84f72206636e..46e873364e0a6c9dbb25d100f25d3533fa219e3b 100644 (file)
--- a/core/producer/layer.h
+++ b/core/producer/layer.h
@@ -1,54 +1,71 @@
 /*\r
-* copyright (c) 2010 Sveriges Television AB <info@casparcg.com>\r
+* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
 *\r
-*  This file is part of CasparCG.\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
+* 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
+* 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 "../monitor/monitor.h"\r
+\r
 #include <common/memory/safe_ptr.h>\r
 \r
 #include <boost/noncopyable.hpp>\r
+#include <boost/thread/future.hpp>\r
+#include <boost/property_tree/ptree_fwd.hpp>\r
+\r
+#include <string>\r
 \r
 namespace caspar { namespace core {\r
 \r
-class frame_producer;\r
+struct frame_producer;\r
 class basic_frame;\r
 \r
 class layer : boost::noncopyable\r
 {\r
+       layer(const layer&);\r
+       layer& operator=(const layer&);\r
 public:\r
-       layer(); // nothrow\r
+       layer(int index = -1); // nothrow\r
        layer(layer&& other); // nothrow\r
        layer& operator=(layer&& other); // nothrow\r
-       layer(const layer&);\r
-       layer& operator=(const layer&);\r
 \r
        void swap(layer& other); // nothrow \r
                \r
-       void load(const safe_ptr<frame_producer>& producer, bool preview); // nothrow\r
+       void load(const safe_ptr<frame_producer>& producer, bool preview, int auto_play_delta); // nothrow\r
        void play(); // nothrow\r
        void pause(); // nothrow\r
        void stop(); // nothrow\r
+       boost::unique_future<std::wstring> call(bool foreground, const std::wstring& param);\r
+\r
+       bool is_paused() const;\r
+       int64_t frame_number() const;\r
+       \r
+       bool empty() const;\r
 \r
        safe_ptr<frame_producer> foreground() const; // nothrow\r
        safe_ptr<frame_producer> background() const; // nothrow\r
 \r
-       safe_ptr<basic_frame> receive(); // nothrow\r
+       safe_ptr<basic_frame> receive(int hints); // nothrow\r
+\r
+       boost::property_tree::wptree info() const;\r
+       \r
+       monitor::source& monitor_output();\r
 private:\r
        struct implementation;\r
        safe_ptr<implementation> impl_;\r