Rearrange some includes of dcpomatic_time.h

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

diff --git a/src/lib/writer.h b/src/lib/writer.h
index 0ff011fa1de22037b392db91bfd479010362a91f..67172b0d4de94a8b655f23e5d8ed2c4554d35a27 100644 (file)
--- a/src/lib/writer.h
+++ b/src/lib/writer.h
@@ -25,10 +25,11 @@
 
 
 #include "atmos_metadata.h"
-#include "types.h"
-#include "player_text.h"
-#include "exception_store.h"
 #include "dcp_text_track.h"
+#include "dcpomatic_time.h"
+#include "exception_store.h"
+#include "player_text.h"
+#include "types.h"
 #include "weak_film.h"
 #include <dcp/atmos_frame.h>
 #include <boost/thread.hpp>
@@ -44,11 +45,11 @@ namespace dcpomatic {
        class FontData;
 }
 
-class Film;
 class AudioBuffers;
+class Film;
 class Job;
-class ReferencedReelAsset;
 class ReelWriter;
+class ReferencedReelAsset;
 
 
 struct QueueItem
@@ -128,7 +129,7 @@ private:
        size_t video_reel (int frame) const;
        void set_digest_progress (Job* job, float progress);
        void write_cover_sheet (boost::filesystem::path output_dcp);
-       void calculate_referenced_digests (boost::function<void (float)> set_progress);
+       void calculate_referenced_digests (std::function<void (float)> set_progress);
        void write_hanging_text (ReelWriter& reel);
        void calculate_digests ();