]> git.sesse.net Git - casparcg/blobdiff - modules/image/image.cpp
Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
[casparcg] / modules / image / image.cpp
index f68dab212f3681b84c29c3c085bcb044c6f3a5cb..a03b01e24a32f952160ddec93e3fe777b238a3a2 100644 (file)
@@ -29,6 +29,7 @@
 #include <core/consumer/frame_consumer.h>
 #include <core/producer/media_info/media_info.h>
 #include <core/producer/media_info/media_info_repository.h>
+#include <core/frame/draw_frame.h>
 #include <core/system_info_provider.h>
 
 #include <common/utf.h>
@@ -47,10 +48,10 @@ std::wstring version()
 void init(core::module_dependencies dependencies)
 {
        FreeImage_Initialise();
-       dependencies.producer_registry->register_producer_factory(create_scroll_producer);
-       dependencies.producer_registry->register_producer_factory(create_producer);
-       dependencies.producer_registry->register_thumbnail_producer_factory(create_thumbnail_producer);
-       core::register_consumer_factory(create_consumer);
+       dependencies.producer_registry->register_producer_factory(L"Image Scroll Producer", create_scroll_producer, describe_scroll_producer);
+       dependencies.producer_registry->register_producer_factory(L"Image Producer", create_producer, describe_producer);
+       dependencies.producer_registry->register_thumbnail_producer(create_thumbnail);
+       dependencies.consumer_registry->register_consumer_factory(L"Image Consumer", create_consumer, describe_consumer);
        dependencies.media_info_repo->register_extractor([](const std::wstring& file, const std::wstring& extension, core::media_info& info)
        {
                if (extension == L".TGA"