2.0. Updated namespaces.

[casparcg] / modules / image / image.cpp

diff --git a/modules/image/image.cpp b/modules/image/image.cpp
index e010fd28807414808c95a328d2689b5a57cf2db6..971a6c4c0884ffb46a4e93ef577c525d79794797 100644 (file)
--- a/modules/image/image.cpp
+++ b/modules/image/image.cpp
@@ -21,24 +21,27 @@
 \r
 #include "producer/image_producer.h"\r
 #include "producer/image_scroll_producer.h"\r
+#include "consumer/image_consumer.h"\r
 \r
 #include <core/producer/frame_producer.h>\r
+#include <core/consumer/frame_consumer.h>\r
 \r
 #include <common/utility/string.h>\r
 \r
 #include <FreeImage.h>\r
 \r
-namespace caspar {\r
+namespace caspar { namespace image {\r
 \r
-void init_image()\r
+void init()\r
 {\r
-       core::register_producer_factory(create_image_scroll_producer);\r
-       core::register_producer_factory(create_image_producer);\r
+       core::register_producer_factory(create_scroll_producer);\r
+       core::register_producer_factory(create_producer);\r
+       core::register_consumer_factory([](const std::vector<std::wstring>& params){return create_consumer(params);});\r
 }\r
 \r
-std::wstring get_image_version()\r
+std::wstring get_version()\r
 {\r
        return widen(std::string(FreeImage_GetVersion()));\r
 }\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file