Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

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

diff --git a/src/lib/writer.h b/src/lib/writer.h
index 14b21f35975c84b8a791bf7c25730f37bb1b9f1a..e08e9f28d0d19e06d51fcd1e2d2baab4203c68d8 100644 (file)
--- a/src/lib/writer.h
+++ b/src/lib/writer.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -23,8 +23,9 @@
  */
 
 #include "types.h"
-#include "player_subtitles.h"
+#include "player_text.h"
 #include "exception_store.h"
+#include "dcp_text_track.h"
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
 #include <boost/thread.hpp>
@@ -47,6 +48,9 @@ struct QueueItem
 public:
        QueueItem ()
                : size (0)
+               , reel (0)
+               , frame (0)
+               , eyes (EYES_BOTH)
        {}
 
        enum Type {
@@ -82,7 +86,7 @@ bool operator== (QueueItem const & a, QueueItem const & b);
  *  or AudioBuffers objects (containing image or sound data respectively)
  *  and writes them to the assets.
  *
- *  ::write() for Data (picture) can be called out of order, and the Writer
+ *  write() for Data (picture) can be called out of order, and the Writer
  *  will sort it out.  write() for AudioBuffers must be called in order.
  */
 
@@ -100,8 +104,8 @@ public:
        void fake_write (Frame, Eyes);
        bool can_repeat (Frame) const;
        void repeat (Frame, Eyes);
-       void write (boost::shared_ptr<const AudioBuffers>);
-       void write (PlayerSubtitles subs, DCPTimePeriod period);
+       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 (ReferencedReelAsset asset);
        void finish ();
@@ -114,6 +118,7 @@ private:
        bool have_sequenced_image_at_queue_head ();
        size_t video_reel (int frame) const;
        void set_digest_progress (Job* job, float progress);
+       void write_cover_sheet ();
 
        /** our Film */
        boost::shared_ptr<const Film> _film;
@@ -121,6 +126,7 @@ private:
        std::vector<ReelWriter> _reels;
        std::vector<ReelWriter>::iterator _audio_reel;
        std::vector<ReelWriter>::iterator _subtitle_reel;
+       std::map<DCPTextTrack, std::vector<ReelWriter>::iterator> _caption_reels;
 
        /** our thread, or 0 */
        boost::thread* _thread;
@@ -140,6 +146,7 @@ private:
         *  ordering
         */
        int _maximum_frames_in_memory;
+       unsigned int _maximum_queue_size;
 
        /** number of FULL written frames */
        int _full_written;