[linux] Don't overwrite thread name if it is already set.

[casparcg] / core / thumbnail_generator.h

diff --git a/core/thumbnail_generator.h b/core/thumbnail_generator.h
index 7cf3f3e60efdbf321ea379107d7118f4167c01a7..22634e219bb1d221156a7d897c753649f1c66dd0 100644 (file)
--- a/core/thumbnail_generator.h
+++ b/core/thumbnail_generator.h
@@ -23,19 +23,17 @@
 
 #include <boost/noncopyable.hpp>
 
-#include "memory.h"
+#include <common/memory.h>
 #include <common/filesystem_monitor.h>
 
-namespace caspar { namespace core {
+#include "fwd.h"
 
-class ogl_device;
-class read_frame;
-struct video_format_desc;
+namespace caspar { namespace core {
 
 typedef std::function<void (
-               const class const_frame& frame,
+               const const_frame& frame,
                const video_format_desc& format_desc,
-               const boost::filesystem::wpath& output_file,
+               const boost::filesystem::path& output_file,
                int width,
                int height)> thumbnail_creator;
 
@@ -44,14 +42,17 @@ class thumbnail_generator : boost::noncopyable
 public:
        thumbnail_generator(
                        filesystem_monitor_factory& monitor_factory,
-                       const boost::filesystem::wpath& media_path,
-                       const boost::filesystem::wpath& thumbnails_path,
+                       const boost::filesystem::path& media_path,
+                       const boost::filesystem::path& thumbnails_path,
                        int width,
                        int height,
                        const video_format_desc& render_video_mode,
-                       std::unique_ptr<class image_mixer> image_mixer,
+                       std::unique_ptr<image_mixer> image_mixer,
                        int generate_delay_millis,
-                       const thumbnail_creator& thumbnail_creator);
+                       const thumbnail_creator& thumbnail_creator,
+                       spl::shared_ptr<media_info_repository> media_info_repo,
+                       spl::shared_ptr<const frame_producer_registry> producer_registry,
+                       bool mipmap);
        ~thumbnail_generator();
        void generate(const std::wstring& media_file);
        void generate_all();
@@ -60,4 +61,4 @@ private:
        spl::unique_ptr<impl> impl_;
 };
 
-}}
\ No newline at end of file
+}}