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

[casparcg] / core / producer / layer.h

diff --git a/core/producer/layer.h b/core/producer/layer.h
index d8adad7f93bb8c9f2659042f41caff5b8202116c..aa7cf5d4ff7eb6f858f4504ec4198ac95ba436a3 100644 (file)
--- a/core/producer/layer.h
+++ b/core/producer/layer.h
@@ -1,82 +1,82 @@
-/*\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 "frame_producer.h"\r
-\r
-#include "../monitor/monitor.h"\r
-\r
-#include <common/forward.h>\r
-#include <common/future_fwd.h>\r
-#include <common/memory.h>\r
-\r
-#include <boost/property_tree/ptree_fwd.hpp>\r
-\r
-#include <string>\r
-\r
-FORWARD1(boost, template<typename T> class optional);\r
-\r
-namespace caspar { namespace core {\r
-       \r
-class layer sealed : public monitor::observable\r
-{\r
-       layer(const layer&);\r
-       layer& operator=(const layer&);\r
-public:\r
-       // Static Members\r
-\r
-       // Constructors\r
-\r
-       explicit layer(int index = -1); \r
-       layer(layer&& other); \r
-\r
-       // Methods\r
-\r
-       layer& operator=(layer&& other); \r
-\r
-       void swap(layer& other);  \r
-               \r
-       void load(spl::shared_ptr<class frame_producer> producer, bool preview, const boost::optional<int32_t>& auto_play_delta = nullptr); \r
-       void play(); \r
-       void pause(); \r
-       void stop(); \r
-       \r
-       class draw_frame receive(const struct video_format_desc& format_desc); \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
-\r
-       // Properties\r
-               \r
-       spl::shared_ptr<class frame_producer>   foreground() const; \r
-       spl::shared_ptr<class frame_producer>   background() const; \r
-\r
-       boost::property_tree::wptree                    info() const;\r
-\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 "frame_producer.h"
+
+#include "../monitor/monitor.h"
+
+#include <common/forward.h>
+#include <common/future_fwd.h>
+#include <common/memory.h>
+
+#include <boost/property_tree/ptree_fwd.hpp>
+
+#include <string>
+
+FORWARD1(boost, template<typename T> class optional);
+
+namespace caspar { namespace core {
+       
+class layer sealed : public monitor::observable
+{
+       layer(const layer&);
+       layer& operator=(const layer&);
+public:
+       // Static Members
+
+       // Constructors
+
+       explicit layer(int index = -1); 
+       layer(layer&& other); 
+
+       // Methods
+
+       layer& operator=(layer&& other); 
+
+       void swap(layer& other);  
+               
+       void load(spl::shared_ptr<class frame_producer> producer, bool preview, const boost::optional<int32_t>& auto_play_delta = nullptr); 
+       void play(); 
+       void pause(); 
+       void stop(); 
+       
+       class draw_frame receive(const struct video_format_desc& format_desc); 
+       
+       // monitor::observable
+
+       void subscribe(const monitor::observable::observer_ptr& o) override;
+       void unsubscribe(const monitor::observable::observer_ptr& o) override;
+
+       // Properties
+               
+       spl::shared_ptr<class frame_producer>   foreground() const; 
+       spl::shared_ptr<class frame_producer>   background() const; 
+
+       boost::property_tree::wptree                    info() const;
+
+private:
+       struct impl;
+       spl::shared_ptr<impl> impl_;
+};
+
 }}
\ No newline at end of file