Fix incorrect alpha step used for RGBA64 sources.

[dcpomatic.git] / src / lib / writer.h

diff --git a/src/lib/writer.h b/src/lib/writer.h
index b4cc3ecaaae8e5d7fcc82259697ab35fd54e24d9..efb6a17d8d54448b740e2b3fc238010c6abff01f 100644 (file)
--- a/src/lib/writer.h
+++ b/src/lib/writer.h
@@ -34,7 +34,6 @@
 #include "exception_store.h"
 #include "font_id_map.h"
 #include "player_text.h"
-#include "types.h"
 #include "weak_film.h"
 #include <dcp/atmos_frame.h>
 #include <boost/thread.hpp>
@@ -135,9 +134,9 @@ private:
        void terminate_thread (bool);
        bool have_sequenced_image_at_queue_head ();
        size_t video_reel (int frame) const;
-       void set_digest_progress (Job* job, float progress);
+       void set_digest_progress(Job* job, int id, int64_t done, int64_t size);
        void write_cover_sheet (boost::filesystem::path output_dcp);
-       void calculate_referenced_digests (std::function<void (float)> set_progress);
+       void calculate_referenced_digests(std::function<void (int64_t, int64_t)> set_progress);
        void write_hanging_text (ReelWriter& reel);
        void calculate_digests ();
 
@@ -205,7 +204,7 @@ private:
        bool _text_only;
 
        boost::mutex _digest_progresses_mutex;
-       std::map<boost::thread::id, float> _digest_progresses;
+       std::map<int, std::pair<int64_t, int64_t>> _digest_progresses;
 
        std::list<ReferencedReelAsset> _reel_assets;