2.0. Updated namespaces.

[casparcg] / modules / oal / consumer / oal_consumer.cpp

diff --git a/modules/oal/consumer/oal_consumer.cpp b/modules/oal/consumer/oal_consumer.cpp
index cd0130a5fedac3dbdd001b8eb5d809f58ad8e90b..35ef456d06f10f3eba6a2373e05c5733c8d31bfe 100644 (file)
--- a/modules/oal/consumer/oal_consumer.cpp
+++ b/modules/oal/consumer/oal_consumer.cpp
@@ -39,7 +39,7 @@
 \r
 #include <tbb/concurrent_queue.h>\r
 \r
-namespace caspar {\r
+namespace caspar { namespace oal {\r
 \r
 struct oal_consumer : public core::frame_consumer,  public sf::SoundStream\r
 {\r
@@ -123,7 +123,7 @@ public:
        }\r
 };\r
 \r
-safe_ptr<core::frame_consumer> create_oal_consumer(const std::vector<std::wstring>& params)\r
+safe_ptr<core::frame_consumer> create_consumer(const std::vector<std::wstring>& params)\r
 {\r
        if(params.size() < 1 || params[0] != L"AUDIO")\r
                return core::frame_consumer::empty();\r
@@ -131,9 +131,9 @@ safe_ptr<core::frame_consumer> create_oal_consumer(const std::vector<std::wstrin
        return make_safe<oal_consumer>();\r
 }\r
 \r
-safe_ptr<core::frame_consumer> create_oal_consumer()\r
+safe_ptr<core::frame_consumer> create_consumer()\r
 {\r
        return make_safe<oal_consumer>();\r
 }\r
 \r
-}\r
+}}\r