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

[casparcg] / accelerator / accelerator.cpp

diff --git a/accelerator/accelerator.cpp b/accelerator/accelerator.cpp
index ef5aaba36e6230bae9951e1815a122bd8e7b2300..b080a3479875359a2705de5098d360e97fb176f9 100644 (file)
--- a/accelerator/accelerator.cpp
+++ b/accelerator/accelerator.cpp
@@ -1,63 +1,63 @@
-#include "stdafx.h"\r
-\r
-#include "accelerator.h"\r
-\r
-#include "cpu/image/image_mixer.h"\r
-#include "ogl/image/image_mixer.h"\r
-\r
-#include "ogl/util/device.h"\r
-\r
-#include <tbb/mutex.h>\r
-\r
-namespace caspar { namespace accelerator {\r
-       \r
-struct accelerator::impl\r
-{\r
-       const std::wstring                              path_;\r
-       tbb::mutex                                              mutex_;\r
-       std::shared_ptr<ogl::device>    ogl_device_;\r
-\r
-       impl(const std::wstring& path)\r
-               : path_(path)\r
-       {\r
-       }\r
-\r
-       std::unique_ptr<core::image_mixer> create_image_mixer()\r
-       {\r
-               try\r
-               {\r
-                       if(path_ == L"gpu" || path_ == L"ogl" || path_ == L"auto" || path_ == L"default")\r
-                       {\r
-                               tbb::mutex::scoped_lock lock(mutex_);\r
-\r
-                               if(!ogl_device_)\r
-                                       ogl_device_.reset(new ogl::device());\r
-\r
-                               return std::unique_ptr<core::image_mixer>(new ogl::image_mixer(spl::make_shared_ptr(ogl_device_)));\r
-                       }\r
-               }\r
-               catch(...)\r
-               {\r
-                       if(path_ == L"gpu" || path_ == L"ogl")\r
-                               CASPAR_LOG_CURRENT_EXCEPTION();\r
-               }\r
-\r
-               return std::unique_ptr<core::image_mixer>(new cpu::image_mixer());\r
-       }\r
-};\r
-\r
-accelerator::accelerator(const std::wstring& path)\r
-       : impl_(new impl(path))\r
-{\r
-}\r
-\r
-accelerator::~accelerator()\r
-{\r
-}\r
-\r
-std::unique_ptr<core::image_mixer> accelerator::create_image_mixer()\r
-{\r
-       return impl_->create_image_mixer();\r
-}\r
-\r
+#include "stdafx.h"
+
+#include "accelerator.h"
+
+#include "cpu/image/image_mixer.h"
+#include "ogl/image/image_mixer.h"
+
+#include "ogl/util/device.h"
+
+#include <tbb/mutex.h>
+
+namespace caspar { namespace accelerator {
+       
+struct accelerator::impl
+{
+       const std::wstring                              path_;
+       tbb::mutex                                              mutex_;
+       std::shared_ptr<ogl::device>    ogl_device_;
+
+       impl(const std::wstring& path)
+               : path_(path)
+       {
+       }
+
+       std::unique_ptr<core::image_mixer> create_image_mixer()
+       {
+               try
+               {
+                       if(path_ == L"gpu" || path_ == L"ogl" || path_ == L"auto" || path_ == L"default")
+                       {
+                               tbb::mutex::scoped_lock lock(mutex_);
+
+                               if(!ogl_device_)
+                                       ogl_device_.reset(new ogl::device());
+
+                               return std::unique_ptr<core::image_mixer>(new ogl::image_mixer(spl::make_shared_ptr(ogl_device_)));
+                       }
+               }
+               catch(...)
+               {
+                       if(path_ == L"gpu" || path_ == L"ogl")
+                               CASPAR_LOG_CURRENT_EXCEPTION();
+               }
+
+               return std::unique_ptr<core::image_mixer>(new cpu::image_mixer());
+       }
+};
+
+accelerator::accelerator(const std::wstring& path)
+       : impl_(new impl(path))
+{
+}
+
+accelerator::~accelerator()
+{
+}
+
+std::unique_ptr<core::image_mixer> accelerator::create_image_mixer()
+{
+       return impl_->create_image_mixer();
+}
+
 }}
\ No newline at end of file