2.0. Updated namespaces.

[casparcg] / modules / decklink / decklink.cpp

diff --git a/modules/decklink/decklink.cpp b/modules/decklink/decklink.cpp
index 22d164959360f13683c9ca6438606d337ce45e3d..94a8ba5561efc4509e51bae01f05296d535b1a01 100644 (file)
--- a/modules/decklink/decklink.cpp
+++ b/modules/decklink/decklink.cpp
@@ -40,17 +40,17 @@
 \r
 #pragma warning(push)\r
 \r
-namespace caspar{\r
+namespace caspar { namespace decklink {\r
 \r
-void init_decklink()\r
+void init()\r
 {\r
-       core::register_consumer_factory(create_decklink_consumer);\r
-       core::register_producer_factory(create_decklink_producer);\r
+       core::register_consumer_factory([](const std::vector<std::wstring>& params){return create_consumer(params);});\r
+       core::register_producer_factory(create_producer);\r
 }\r
 \r
-std::wstring get_decklink_version() \r
+std::wstring get_version() \r
 {\r
-       std::wstring version = L"Unknown";\r
+       std::wstring version = L"Not found";\r
 \r
        ::CoInitialize(nullptr);\r
        try\r
@@ -65,7 +65,7 @@ std::wstring get_decklink_version()
        return version;\r
 }\r
 \r
-std::vector<std::wstring> get_decklink_device_list()\r
+std::vector<std::wstring> get_device_list()\r
 {\r
        std::vector<std::wstring> devices;\r
 \r
@@ -80,7 +80,7 @@ std::vector<std::wstring> get_decklink_device_list()
                        {\r
                                BSTR model_name = L"Unknown";\r
                                decklink->GetModelName(&model_name);\r
-                               devices.push_back(L"[" + boost::lexical_cast<std::wstring>(n) + L"] " + model_name);    \r
+                               devices.push_back(std::wstring(model_name) + L" [" + boost::lexical_cast<std::wstring>(n) + L"]");      \r
                        }\r
                }\r
        }\r
@@ -90,4 +90,4 @@ std::vector<std::wstring> get_decklink_device_list()
        return devices;\r
 }\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file