Extract common code out into kdm_for_screen()

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

diff --git a/src/lib/writer.h b/src/lib/writer.h
index e08e9f28d0d19e06d51fcd1e2d2baab4203c68d8..d09b062649f94ea55f74ad563847f54118330772 100644 (file)
--- a/src/lib/writer.h
+++ b/src/lib/writer.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -36,10 +36,13 @@ namespace dcp {
        class Data;
 }
 
+namespace dcpomatic {
+       class Font;
+}
+
 class Film;
 class AudioBuffers;
 class Job;
-class Font;
 class ReferencedReelAsset;
 class ReelWriter;
 
@@ -104,9 +107,9 @@ public:
        void fake_write (Frame, Eyes);
        bool can_repeat (Frame) const;
        void repeat (Frame, Eyes);
-       void write (boost::shared_ptr<const AudioBuffers>, DCPTime time);
-       void write (PlayerText text, TextType type, boost::optional<DCPTextTrack>, DCPTimePeriod period);
-       void write (std::list<boost::shared_ptr<Font> > fonts);
+       void write (boost::shared_ptr<const AudioBuffers>, dcpomatic::DCPTime time);
+       void write (PlayerText text, TextType type, boost::optional<DCPTextTrack>, dcpomatic::DCPTimePeriod period);
+       void write (std::list<boost::shared_ptr<dcpomatic::Font> > fonts);
        void write (ReferencedReelAsset asset);
        void finish ();
 
@@ -128,8 +131,8 @@ private:
        std::vector<ReelWriter>::iterator _subtitle_reel;
        std::map<DCPTextTrack, std::vector<ReelWriter>::iterator> _caption_reels;
 
-       /** our thread, or 0 */
-       boost::thread* _thread;
+       /** our thread */
+       boost::thread _thread;
        /** true if our thread should finish */
        bool _finish;
        /** queue of things to write to disk */
@@ -148,6 +151,30 @@ private:
        int _maximum_frames_in_memory;
        unsigned int _maximum_queue_size;
 
+       class LastWritten
+       {
+       public:
+               LastWritten()
+                       : _frame(-1)
+                       , _eyes(EYES_RIGHT)
+               {}
+
+               /** @return true if qi is the next item after this one */
+               bool next (QueueItem qi) const;
+               void update (QueueItem qi);
+
+               int frame () const {
+                       return _frame;
+               }
+
+       private:
+               int _frame;
+               Eyes _eyes;
+       };
+
+       /** The last frame written to each reel */
+       std::vector<LastWritten> _last_written;
+
        /** number of FULL written frames */
        int _full_written;
        /** number of FAKE written frames */
@@ -163,5 +190,5 @@ private:
 
        std::list<ReferencedReelAsset> _reel_assets;
 
-       std::list<boost::shared_ptr<Font> > _fonts;
+       std::list<boost::shared_ptr<dcpomatic::Font> > _fonts;
 };