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

[casparcg] / core / producer / transition / transition_producer.h

diff --git a/core/producer/transition/transition_producer.h b/core/producer/transition/transition_producer.h
index c4e47affcae039e0b938be57a8c58348403fccf8..2992131a22ac9551370f3a646f2817e874ac1a20 100644 (file)
--- a/core/producer/transition/transition_producer.h
+++ b/core/producer/transition/transition_producer.h
@@ -1,75 +1,75 @@
-/*\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 "../../video_format.h"\r
-\r
-#include <common/enum_class.h>\r
-#include <common/memory.h>\r
-#include <common/tweener.h>\r
-\r
-#include <string>\r
-\r
-namespace caspar { namespace core {\r
-       \r
-struct transition_type_def\r
-{\r
-       enum type\r
-       {\r
-               cut,    \r
-               mix,    \r
-               push,    \r
-               slide,  \r
-               wipe,\r
-               count\r
-       };\r
-};\r
-typedef enum_class<transition_type_def> transition_type;\r
-       \r
-struct transition_direction_def\r
-{\r
-       enum type\r
-       {\r
-               from_left,\r
-               from_right,\r
-               count\r
-       };\r
-};\r
-typedef enum_class<transition_direction_def> transition_direction;\r
-\r
-struct transition_info\r
-{\r
-       transition_info() \r
-               : type(transition_type::cut)\r
-               , duration(0)\r
-               , direction(transition_direction::from_left)\r
-               , tweener(L"linear"){}\r
-               \r
-       int                                             duration;\r
-       transition_direction    direction;\r
-       transition_type                 type;\r
-       tweener                                 tweener;\r
-};\r
-\r
-spl::shared_ptr<class frame_producer> create_transition_producer(const field_mode& mode, const spl::shared_ptr<class frame_producer>& destination, const transition_info& info);\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 "../../video_format.h"
+
+#include <common/enum_class.h>
+#include <common/memory.h>
+#include <common/tweener.h>
+
+#include <string>
+
+namespace caspar { namespace core {
+       
+struct transition_type_def
+{
+       enum type
+       {
+               cut,    
+               mix,    
+               push,    
+               slide,  
+               wipe,
+               count
+       };
+};
+typedef enum_class<transition_type_def> transition_type;
+       
+struct transition_direction_def
+{
+       enum type
+       {
+               from_left,
+               from_right,
+               count
+       };
+};
+typedef enum_class<transition_direction_def> transition_direction;
+
+struct transition_info
+{
+       transition_info() 
+               : type(transition_type::cut)
+               , duration(0)
+               , direction(transition_direction::from_left)
+               , tweener(L"linear"){}
+               
+       int                                             duration;
+       transition_direction    direction;
+       transition_type                 type;
+       tweener                                 tweener;
+};
+
+spl::shared_ptr<class frame_producer> create_transition_producer(const field_mode& mode, const spl::shared_ptr<class frame_producer>& destination, const transition_info& info);
+
 }}
\ No newline at end of file