X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fwriter.h;h=71e04df96053c7cf9e7b756421b9e658e925a797;hp=0e1c0e02f3e66dc5b5db6d16b9ec7c98bd5274f3;hb=ca981c8cfa23111e92be329f1c2dfbe3a07b4247;hpb=fdcbd7eb473950f784fba05dcbf4bff115dbbd06

diff --git a/src/lib/writer.h b/src/lib/writer.h
index 0e1c0e02f..71e04df96 100644
--- 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-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -22,9 +22,12 @@
  *  @brief Writer class.
  */
 
+#include "atmos_metadata.h"
 #include "types.h"
-#include "player_subtitles.h"
+#include "player_text.h"
 #include "exception_store.h"
+#include "dcp_text_track.h"
+#include <dcp/atmos_frame.h>
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
 #include <boost/thread.hpp>
@@ -35,10 +38,13 @@ namespace dcp {
 	class Data;
 }
 
+namespace dcpomatic {
+	class Font;
+}
+
 class Film;
 class AudioBuffers;
 class Job;
-class Font;
 class ReferencedReelAsset;
 class ReelWriter;
 
@@ -103,10 +109,11 @@ 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 (PlayerSubtitles subs, 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 write (boost::shared_ptr<const dcp::AtmosFrame> atmos, dcpomatic::DCPTime time, AtmosMetadata metadata);
 	void finish ();
 
 	void set_encoder_threads (int threads);
@@ -125,9 +132,11 @@ 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;
+	std::vector<ReelWriter>::iterator _atmos_reel;
 
-	/** 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 */
@@ -146,6 +155,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 */
@@ -161,5 +194,5 @@ private:
 
 	std::list<ReferencedReelAsset> _reel_assets;
 
-	std::list<boost::shared_ptr<Font> > _fonts;
+	std::list<boost::shared_ptr<dcpomatic::Font> > _fonts;
 };