2.0.0.2: Reverted and displayed IS_KEY/KEY_DEPTH. Needs more work.

[casparcg] / core / producer / layer.h

diff --git a/core/producer/layer.h b/core/producer/layer.h
index b21caaa13aab03294504fb07528284399799b25e..2aab7b3876a8c15e047a16c7e99f261e1687b36e 100644 (file)
--- a/core/producer/layer.h
+++ b/core/producer/layer.h
@@ -1,45 +1,58 @@
+/*\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
 #pragma once\r
 \r
 #include <common/memory/safe_ptr.h>\r
-#include <common/utility/printable.h>\r
 \r
 #include <boost/noncopyable.hpp>\r
 \r
-#include <tbb/atomic.h>\r
-\r
-#include <memory>\r
-\r
 namespace caspar { namespace core {\r
 \r
 class frame_producer;\r
-class draw_frame;\r
+class basic_frame;\r
 \r
 class layer : boost::noncopyable\r
 {\r
 public:\r
-       layer(int index, const printer& parent_printer = nullptr); // nothrow\r
-       ~layer();\r
+       layer(); // 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 play_on_load = false); // nothrow\r
-       void preview(const safe_ptr<frame_producer>& producer); // nothrow\r
+       void load(const safe_ptr<frame_producer>& producer, bool preview); // nothrow\r
        void play(); // nothrow\r
        void pause(); // nothrow\r
        void stop(); // nothrow\r
-       void clear(); // nothrow\r
+       void param(const std::wstring& param);\r
 \r
        safe_ptr<frame_producer> foreground() const; // nothrow\r
        safe_ptr<frame_producer> background() const; // nothrow\r
 \r
-       safe_ptr<draw_frame> receive(); // nothrow\r
-\r
-       std::wstring print() const;\r
+       safe_ptr<basic_frame> receive(); // nothrow\r
 private:\r
        struct implementation;\r
-       tbb::atomic<implementation*> impl_;\r
+       safe_ptr<implementation> impl_;\r
 };\r
 \r
 }}
\ No newline at end of file