2.0. Updated namespaces.

[casparcg] / modules / flash / producer / flash_producer.cpp

diff --git a/modules/flash/producer/flash_producer.cpp b/modules/flash/producer/flash_producer.cpp
index c285ba9fcc876ab55a9843bed79fa7e899958dda..13a0fa3425259423d3783322202b9ffcd482f820 100644 (file)
--- a/modules/flash/producer/flash_producer.cpp
+++ b/modules/flash/producer/flash_producer.cpp
@@ -49,7 +49,7 @@
 \r
 #include <tbb/spin_mutex.h>\r
 \r
-namespace caspar {\r
+namespace caspar { namespace flash {\r
                \r
 class bitmap\r
 {\r
@@ -404,14 +404,14 @@ public:
        }\r
 };\r
 \r
-safe_ptr<core::frame_producer> create_flash_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params)\r
+safe_ptr<core::frame_producer> create_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params)\r
 {\r
        auto template_host = get_template_host(frame_factory->get_video_format_desc());\r
        \r
        return make_safe<flash_producer>(frame_factory, env::template_folder() + L"\\" + widen(template_host.filename), template_host.width, template_host.height);\r
 }\r
 \r
-std::wstring find_flash_template(const std::wstring& template_name)\r
+std::wstring find_template(const std::wstring& template_name)\r
 {\r
        if(boost::filesystem::exists(template_name + L".ft")) \r
                return template_name + L".ft";\r
@@ -422,4 +422,4 @@ std::wstring find_flash_template(const std::wstring& template_name)
        return L"";\r
 }\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file