2.0. Updated namespaces.

[casparcg] / modules / bluefish / bluefish.cpp

diff --git a/modules/bluefish/bluefish.cpp b/modules/bluefish/bluefish.cpp
index 8cd7bf9a991e4422cbea8d230108fa0202a48b50..73a7c8bc37a31f38d9efdeee4c88f4d9480d0ba5 100644 (file)
--- a/modules/bluefish/bluefish.cpp
+++ b/modules/bluefish/bluefish.cpp
@@ -19,22 +19,27 @@
 */\r
 #include "bluefish.h"\r
 \r
+#include "consumer/bluefish_consumer.h"\r
+\r
 #include "util/blue_velvet.h"\r
 \r
+#include <common/log/log.h>\r
+#include <common/utility/string.h>\r
+\r
 #include <core/consumer/frame_consumer.h>\r
 \r
-#include "consumer/bluefish_consumer.h"\r
+#include <boost/lexical_cast.hpp>\r
 \r
-namespace caspar {\r
+namespace caspar { namespace bluefish {\r
 \r
-void init_bluefish()\r
+void init()\r
 {\r
        try\r
        {\r
                blue_initialize();\r
                core::register_consumer_factory([](const std::vector<std::wstring>& params)\r
                {\r
-                       return create_bluefish_consumer(params);\r
+                       return create_consumer(params);\r
                });\r
        }\r
        catch(...)\r
@@ -44,7 +49,7 @@ void init_bluefish()
        }\r
 }\r
 \r
-std::wstring get_bluefish_version()\r
+std::wstring get_version()\r
 {\r
        try\r
        {\r
@@ -61,7 +66,7 @@ std::wstring get_bluefish_version()
        return widen(std::string(BlueVelvetVersion()));\r
 }\r
 \r
-std::vector<std::wstring> get_bluefish_device_list()\r
+std::vector<std::wstring> get_device_list()\r
 {\r
        std::vector<std::wstring> devices;\r
 \r
@@ -81,4 +86,5 @@ std::vector<std::wstring> get_bluefish_device_list()
 \r
        return devices;\r
 }\r
-}
\ No newline at end of file
+\r
+}}
\ No newline at end of file