X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fwriter.h;h=41d4d4474bae3dde1e97e35f9d6392aeb165315b;hp=66fe98ec734c914d3de27eeb4b4ccde15e6309b7;hb=a5e87b6f0f496f4ed71d9129d40a5baebb68495f;hpb=d2137ac5db409e686b4d9b3fa567935a5e416d41

diff --git a/src/lib/writer.h b/src/lib/writer.h
index 66fe98ec7..41d4d4474 100644
--- a/src/lib/writer.h
+++ b/src/lib/writer.h
@@ -21,19 +21,20 @@
  *  @brief Writer class.
  */
 
-#include <list>
-#include <boost/shared_ptr.hpp>
-#include <boost/thread.hpp>
-#include <boost/thread/condition.hpp>
-#include <dcp/subtitle_content.h>
 #include "exceptions.h"
 #include "types.h"
 #include "player_subtitles.h"
+#include <boost/shared_ptr.hpp>
+#include <boost/weak_ptr.hpp>
+#include <boost/thread.hpp>
+#include <boost/thread/condition.hpp>
+#include <list>
 
 class Film;
 class EncodedData;
 class AudioBuffers;
 class Job;
+class Font;
 
 namespace dcp {
 	class MonoPictureMXF;
@@ -44,6 +45,7 @@ namespace dcp {
 	class PictureMXFWriter;
 	class SoundMXF;
 	class SoundMXFWriter;
+	class InteropSubtitleContent;
 }
 
 struct QueueItem
@@ -93,7 +95,8 @@ public:
 	void write (boost::shared_ptr<const EncodedData>, int, Eyes);
 	void fake_write (int, Eyes);
 	void write (boost::shared_ptr<const AudioBuffers>);
-	void write (PlayerSubtitles);
+	void write (PlayerSubtitles subs);
+	void write (std::list<boost::shared_ptr<Font> > fonts);
 	void repeat (int f, Eyes);
 	void finish ();
 
@@ -104,6 +107,10 @@ private:
 	void check_existing_picture_mxf ();
 	bool check_existing_picture_mxf_frame (FILE *, int, Eyes);
 	bool have_sequenced_image_at_queue_head ();
+	/** maximum number of frames to hold in memory, for when we are managing
+	 *  ordering
+	 */
+	int maximum_frames_in_memory () const;
 
 	/** our Film */
 	boost::shared_ptr<const Film> _film;
@@ -130,10 +137,6 @@ private:
 	/** the index of the last written frame */
 	int _last_written_frame;
 	Eyes _last_written_eyes;
-	/** maximum number of frames to hold in memory, for when we are managing
-	    ordering
-	*/
-	static const int _maximum_frames_in_memory;
 
 	/** number of FULL written frames */
 	int _full_written;
@@ -148,5 +151,7 @@ private:
 	boost::shared_ptr<dcp::PictureMXFWriter> _picture_mxf_writer;
 	boost::shared_ptr<dcp::SoundMXF> _sound_mxf;
 	boost::shared_ptr<dcp::SoundMXFWriter> _sound_mxf_writer;
-	boost::shared_ptr<dcp::SubtitleContent> _subtitle_content;
+	boost::shared_ptr<dcp::InteropSubtitleContent> _subtitle_content;
+
+	std::list<boost::shared_ptr<Font> > _fonts;
 };