X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=core%2Fthumbnail_generator.cpp;h=a80702c8a9dcf62f765b0f1b415a9ae6d32bc3ae;hb=7518b70d42eaba05471933ae69e130a3e4546a12;hp=da39a75e1e3b4cb1aeb94b37e37134925cfbb2b1;hpb=b6b6469c10b439859f45d6b893a90d4b1a3d7727;p=casparcg

diff --git a/core/thumbnail_generator.cpp b/core/thumbnail_generator.cpp
index da39a75e1..a80702c8a 100644
--- a/core/thumbnail_generator.cpp
+++ b/core/thumbnail_generator.cpp
@@ -246,31 +246,6 @@ public:
 		std::promise<void> thumbnail_ready;
 
 		{
-			auto producer = frame_producer::empty();
-
-			try
-			{
-				producer = producer_registry_->create_thumbnail_producer(
-						frame_producer_dependencies(image_mixer_, { }, format_desc_, producer_registry_),
-						media_file.wstring());
-			}
-			catch (const boost::thread_interrupted&)
-			{
-				throw;
-			}
-			catch (...)
-			{
-				CASPAR_LOG_CURRENT_EXCEPTION_AT_LEVEL(trace);
-				CASPAR_LOG(info) << L"Thumbnail producer failed to initialize for " << media_file_with_extension << L". Turn on log level trace to see more information.";
-				return;
-			}
-
-			if (producer == frame_producer::empty())
-			{
-				CASPAR_LOG(debug) << L"No appropriate thumbnail producer found for " << media_file_with_extension;
-				return;
-			}
-
 			boost::filesystem::create_directories(png_file.parent_path());
 			output_->on_send = [this, &png_file] (const_frame frame)
 			{
@@ -282,7 +257,7 @@ public:
 
 			try
 			{
-				raw_frame = producer->create_thumbnail_frame();
+				raw_frame = producer_registry_->create_thumbnail(frame_producer_dependencies(image_mixer_, {}, format_desc_, producer_registry_), media_file.wstring());
 				media_info_repo_->remove(file.wstring());
 				media_info_repo_->get(file.wstring());
 			}
@@ -300,7 +275,7 @@ public:
 			if (raw_frame == draw_frame::empty()
 					|| raw_frame == draw_frame::late())
 			{
-				CASPAR_LOG(debug) << L"No thumbnail generated for " << media_file_with_extension;
+				CASPAR_LOG(debug) << L"No thumbnail producer for " << media_file_with_extension;
 				return;
 			}