2.0. Updated namespaces.

[casparcg] / modules / image / producer / image_scroll_producer.cpp

diff --git a/modules/image/producer/image_scroll_producer.cpp b/modules/image/producer/image_scroll_producer.cpp
index 797fec3983076e5e8b4f93eabf2a037e8c50d6f7..4a7b8d195a0b38ebf3c729d1bfdc89820e7eb58b 100644 (file)
--- a/modules/image/producer/image_scroll_producer.cpp
+++ b/modules/image/producer/image_scroll_producer.cpp
@@ -45,7 +45,7 @@
 \r
 using namespace boost::assign;\r
 \r
-namespace caspar {\r
+namespace caspar { namespace image {\r
                \r
 struct image_scroll_producer : public core::frame_producer\r
 {      \r
@@ -167,7 +167,7 @@ struct image_scroll_producer : public core::frame_producer
                        for(size_t n = 0; n < frames_.size(); ++n)\r
                        {\r
                                frames_[n]->get_frame_transform().fill_translation[0] = start_offset_[0];\r
-                               frames_[n]->get_frame_transform().fill_translation[1] = start_offset_[1] - (n+1) + delta_ * 1.0/static_cast<double>(format_desc_.height);\r
+                               frames_[n]->get_frame_transform().fill_translation[1] = start_offset_[1] - (n+1) + delta_ * 0.5/static_cast<double>(format_desc_.height);\r
                        }\r
                }\r
                else\r
@@ -177,7 +177,7 @@ struct image_scroll_producer : public core::frame_producer
 \r
                        for(size_t n = 0; n < frames_.size(); ++n)\r
                        {\r
-                               frames_[n]->get_frame_transform().fill_translation[0] = start_offset_[0] - (n+1) + delta_ * 1.0/static_cast<double>(format_desc_.width);                                \r
+                               frames_[n]->get_frame_transform().fill_translation[0] = start_offset_[0] - (n+1) + delta_ * 0.5/static_cast<double>(format_desc_.width);                                \r
                                frames_[n]->get_frame_transform().fill_translation[1] = start_offset_[1];\r
                        }\r
                }\r
@@ -211,7 +211,7 @@ struct image_scroll_producer : public core::frame_producer
        }\r
 };\r
 \r
-safe_ptr<core::frame_producer> create_image_scroll_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params)\r
+safe_ptr<core::frame_producer> create_scroll_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params)\r
 {\r
        static const std::vector<std::wstring> extensions = list_of(L"png")(L"tga")(L"bmp")(L"jpg")(L"jpeg")(L"gif")(L"tiff")(L"tif")(L"jp2")(L"jpx")(L"j2k")(L"j2c");\r
        std::wstring filename = env::media_folder() + L"\\" + params[0];\r
@@ -238,5 +238,4 @@ safe_ptr<core::frame_producer> create_image_scroll_producer(const safe_ptr<core:
        return make_safe<image_scroll_producer>(frame_factory, filename + L"." + *ext, speed);\r
 }\r
 \r
-\r
-}
\ No newline at end of file
+}}
\ No newline at end of file