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

[casparcg] / modules / flash / producer / cg_proxy.h

diff --git a/modules/flash/producer/cg_proxy.h b/modules/flash/producer/cg_proxy.h
index 98228cdbfb4bde2a7a2791e96c77769a9964a9f5..0448a20b1e1d541e396db402e8e98e05a5d192df 100644 (file)
--- a/modules/flash/producer/cg_proxy.h
+++ b/modules/flash/producer/cg_proxy.h
@@ -1,64 +1,64 @@
-/*\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 <core/producer/frame_producer.h>\r
-#include <core/producer/stage.h>\r
-#include <core/video_format.h>\r
-#include <core/video_channel.h>\r
-\r
-#include <boost/thread/future.hpp>\r
-\r
-#include <string>\r
-\r
-namespace caspar { namespace flash {\r
-               \r
-class cg_proxy\r
-{\r
-public:\r
-       static const unsigned int DEFAULT_LAYER = 9999;\r
-\r
-       explicit cg_proxy(const spl::shared_ptr<core::frame_producer>& producer);\r
-       cg_proxy(cg_proxy&& other);\r
-       \r
-       //cg_proxy\r
-\r
-       void add(int layer, const std::wstring& template_name,  bool play_on_load, const std::wstring& start_from_label = L"", const std::wstring& data = L"");\r
-       void remove(int layer);\r
-       void play(int layer);\r
-       void stop(int layer, unsigned int mix_out_duration);\r
-       void next(int layer);\r
-       void update(int layer, const std::wstring& data);\r
-       std::wstring invoke(int layer, const std::wstring& label);\r
-       std::wstring description(int layer);\r
-       std::wstring template_host_info();\r
-\r
-private:\r
-       struct impl;\r
-       std::shared_ptr<impl> impl_;\r
-};\r
-cg_proxy create_cg_proxy(const spl::shared_ptr<core::video_channel>& video_channel, int layer_index = cg_proxy::DEFAULT_LAYER);\r
-\r
-spl::shared_ptr<core::frame_producer> create_ct_producer(const spl::shared_ptr<core::frame_factory> frame_factory, const core::video_format_desc& format_desc, const std::vector<std::wstring>& params);\r
-spl::shared_ptr<core::frame_producer> create_swf_producer(const spl::shared_ptr<core::frame_factory> frame_factory, const core::video_format_desc& format_desc, const std::vector<std::wstring>& params);\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 <core/producer/frame_producer.h>
+#include <core/producer/stage.h>
+#include <core/video_format.h>
+#include <core/video_channel.h>
+
+#include <boost/thread/future.hpp>
+
+#include <string>
+
+namespace caspar { namespace flash {
+               
+class cg_proxy
+{
+public:
+       static const unsigned int DEFAULT_LAYER = 9999;
+
+       explicit cg_proxy(const spl::shared_ptr<core::frame_producer>& producer);
+       cg_proxy(cg_proxy&& other);
+       
+       //cg_proxy
+
+       void add(int layer, const std::wstring& template_name,  bool play_on_load, const std::wstring& start_from_label = L"", const std::wstring& data = L"");
+       void remove(int layer);
+       void play(int layer);
+       void stop(int layer, unsigned int mix_out_duration);
+       void next(int layer);
+       void update(int layer, const std::wstring& data);
+       std::wstring invoke(int layer, const std::wstring& label);
+       std::wstring description(int layer);
+       std::wstring template_host_info();
+
+private:
+       struct impl;
+       std::shared_ptr<impl> impl_;
+};
+cg_proxy create_cg_proxy(const spl::shared_ptr<core::video_channel>& video_channel, int layer_index = cg_proxy::DEFAULT_LAYER);
+
+spl::shared_ptr<core::frame_producer> create_ct_producer(const spl::shared_ptr<core::frame_factory> frame_factory, const core::video_format_desc& format_desc, const std::vector<std::wstring>& params);
+spl::shared_ptr<core::frame_producer> create_swf_producer(const spl::shared_ptr<core::frame_factory> frame_factory, const core::video_format_desc& format_desc, const std::vector<std::wstring>& params);
+
+}}