2.0. Updated namespaces.

[casparcg] / modules / flash / flash.cpp

diff --git a/modules/flash/flash.cpp b/modules/flash/flash.cpp
index bfd8d7e97cb92d9870a2a8b6a2b5910acfd6c27b..9378a073d09a3fa7682baf37064d6db0d2b3c744 100644 (file)
--- a/modules/flash/flash.cpp
+++ b/modules/flash/flash.cpp
@@ -23,13 +23,12 @@
 \r
 #include "producer/cg_producer.h"\r
 #include "producer/flash_producer.h"\r
-#include "producer/flash_producer.h"\r
 \r
 #include <common/env.h>\r
 \r
-namespace caspar{\r
+namespace caspar { namespace flash {\r
 \r
-void init_flash()\r
+void init()\r
 {\r
        core::register_producer_factory(create_ct_producer);\r
 }\r
@@ -39,7 +38,7 @@ std::wstring get_cg_version()
        return L"Unknown";\r
 }\r
 \r
-std::wstring get_flash_version()\r
+std::wstring get_version()\r
 {              \r
        std::wstring version = L"Not found";\r
 #ifdef WIN32\r
@@ -62,4 +61,4 @@ std::wstring get_flash_version()
        return version;\r
 }\r
 \r
-}\r
+}}\r