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

[casparcg] / core / mixer / mixer.h

diff --git a/core/mixer/mixer.h b/core/mixer/mixer.h
index 328b852387743b7300f86138ec9787cba859fac0..d4cceaa3f7fd3ae4218ebb3a5deb8c3c57ebd288 100644 (file)
--- a/core/mixer/mixer.h
+++ b/core/mixer/mixer.h
@@ -1,70 +1,70 @@
-/*\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 "image/blend_modes.h"\r
-\r
-#include <common/forward.h>\r
-#include <common/future_fwd.h>\r
-#include <common/memory.h>\r
-#include <common/reactive.h>\r
-\r
-#include <core/video_format.h>\r
-\r
-#include <boost/property_tree/ptree_fwd.hpp>\r
-\r
-#include <map>\r
-\r
-FORWARD2(caspar, diagnostics, class graph);\r
-\r
-namespace caspar { namespace core {\r
-       \r
-class mixer sealed\r
-{\r
-       mixer(const mixer&);\r
-       mixer& operator=(const mixer&);\r
-public:\r
-       \r
-       // Static Members\r
-                                       \r
-       // Constructors\r
-       \r
-       explicit mixer(spl::shared_ptr<diagnostics::graph> graph, spl::shared_ptr<class image_mixer> image_mixer);\r
-\r
-       // Methods\r
-               \r
-       class const_frame operator()(std::map<int, class draw_frame> frames, const struct video_format_desc& format_desc);\r
-       \r
-       void set_blend_mode(int index, blend_mode value);\r
-\r
-       class mutable_frame create_frame(const void* tag, const struct pixel_format_desc& desc);\r
-\r
-       // Properties\r
-\r
-       boost::unique_future<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 "image/blend_modes.h"
+
+#include <common/forward.h>
+#include <common/future_fwd.h>
+#include <common/memory.h>
+#include <common/reactive.h>
+
+#include <core/video_format.h>
+
+#include <boost/property_tree/ptree_fwd.hpp>
+
+#include <map>
+
+FORWARD2(caspar, diagnostics, class graph);
+
+namespace caspar { namespace core {
+       
+class mixer sealed
+{
+       mixer(const mixer&);
+       mixer& operator=(const mixer&);
+public:
+       
+       // Static Members
+                                       
+       // Constructors
+       
+       explicit mixer(spl::shared_ptr<diagnostics::graph> graph, spl::shared_ptr<class image_mixer> image_mixer);
+
+       // Methods
+               
+       class const_frame operator()(std::map<int, class draw_frame> frames, const struct video_format_desc& format_desc);
+       
+       void set_blend_mode(int index, blend_mode value);
+
+       class mutable_frame create_frame(const void* tag, const struct pixel_format_desc& desc);
+
+       // Properties
+
+       boost::unique_future<boost::property_tree::wptree> info() const;
+
+private:
+       struct impl;
+       spl::shared_ptr<impl> impl_;
+};
+
 }}
\ No newline at end of file