2.0. Updated namespaces.

[casparcg] / modules / ogl / ogl.cpp

diff --git a/modules/ogl/ogl.cpp b/modules/ogl/ogl.cpp
index 9d356fbafcf436688f8583778b6d8ebbdf95f1aa..08e9f3ede63059141d910a70d0d2c8cafc467011 100644 (file)
--- a/modules/ogl/ogl.cpp
+++ b/modules/ogl/ogl.cpp
@@ -1,15 +1,33 @@
+/*\r
+* copyright (c) 2010 Sveriges Television AB <info@casparcg.com>\r
+*\r
+*  This file is part of CasparCG.\r
+*\r
+*    CasparCG is free software: you can redistribute it and/or modify\r
+*    it under the terms of the GNU General Public License as published by\r
+*    the Free Software Foundation, either version 3 of the License, or\r
+*    (at your option) any later version.\r
+*\r
+*    CasparCG is distributed in the hope that it will be useful,\r
+*    but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+*    GNU General Public License for more details.\r
+\r
+*    You should have received a copy of the GNU General Public License\r
+*    along with CasparCG.  If not, see <http://www.gnu.org/licenses/>.\r
+*\r
+*/\r
 #include "ogl.h"\r
 \r
 #include "consumer/ogl_consumer.h"\r
 \r
 #include <core/consumer/frame_consumer.h>\r
 \r
-namespace caspar\r
-{\r
+namespace caspar { namespace ogl {\r
 \r
-void init_ogl()\r
+void init()\r
 {\r
-       core::register_consumer_factory(create_ogl_consumer);\r
+       caspar::core::register_consumer_factory([](const std::vector<std::wstring>& params){return create_consumer(params);});\r
 }\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file