Simplified thumbnail creation, making it less intrusive in the frame_producer design.

[casparcg] / modules / image / producer / image_producer.cpp

diff --git a/modules/image/producer/image_producer.cpp b/modules/image/producer/image_producer.cpp
index 70902fd1ddd3eb5bd78ba2d2c233bc65cc433f64..0da1a981c39e69ec3efdf7093db789262eadf51b 100644 (file)
--- a/modules/image/producer/image_producer.cpp
+++ b/modules/image/producer/image_producer.cpp
@@ -126,11 +126,6 @@ struct image_producer : public core::frame_producer_base
                return frame_;
        }
 
-       core::draw_frame create_thumbnail_frame() override
-       {
-               return frame_;
-       }
-
        core::constraints& pixel_constraints() override
        {
                return constraints_;
@@ -277,9 +272,9 @@ spl::shared_ptr<core::frame_producer> create_producer(const core::frame_producer
 }
 
 
-spl::shared_ptr<core::frame_producer> create_thumbnail_producer(const core::frame_producer_dependencies& dependencies, const std::vector<std::wstring>& params)
+core::draw_frame create_thumbnail(const core::frame_producer_dependencies& dependencies, const std::wstring& media_file)
 {
-       std::wstring filename = env::media_folder() + params.at(0);
+       std::wstring filename = env::media_folder() + media_file;
 
        auto ext = std::find_if(g_extensions.begin(), g_extensions.end(), [&](const std::wstring& ex) -> bool
        {
@@ -289,9 +284,14 @@ spl::shared_ptr<core::frame_producer> create_thumbnail_producer(const core::fram
        });
 
        if (ext == g_extensions.end())
-               return core::frame_producer::empty();
+               return core::draw_frame::empty();
 
-       return spl::make_shared<image_producer>(dependencies.frame_factory, *caspar::find_case_insensitive(filename + *ext), true);
+       spl::shared_ptr<core::frame_producer> producer = spl::make_shared<image_producer>(
+                       dependencies.frame_factory,
+                       *caspar::find_case_insensitive(filename + *ext),
+                       true);
+       
+       return producer->receive();
 }
 
 }}