d588620e70bf15da29cc242e4ae8d86977e8f36a from master; fix hang if you cancel a paused...

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

diff --git a/src/lib/writer.h b/src/lib/writer.h
index 2ddf70380181534d8f49b1326479dc5270b61f7a..e63591a8a338d50351b8ed4f0f45ad48e794c148 100644 (file)
--- a/src/lib/writer.h
+++ b/src/lib/writer.h
@@ -21,17 +21,20 @@
  *  @brief Writer class.
  */
 
-#include <list>
+#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 "exceptions.h"
-#include "types.h"
+#include <list>
 
 class Film;
 class EncodedData;
 class AudioBuffers;
 class Job;
+class Font;
 
 namespace dcp {
        class MonoPictureMXF;
@@ -42,6 +45,7 @@ namespace dcp {
        class PictureMXFWriter;
        class SoundMXF;
        class SoundMXFWriter;
+       class InteropSubtitleContent;
 }
 
 struct QueueItem
@@ -91,9 +95,13 @@ 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 subs);
+       void write (std::list<boost::shared_ptr<Font> > fonts);
        void repeat (int f, Eyes);
        void finish ();
 
+       void set_encoder_threads (int threads);
+
 private:
 
        void thread ();
@@ -128,10 +136,10 @@ private:
        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;
-
+        *  ordering
+        */
+       int _maximum_frames_in_memory;
+       
        /** number of FULL written frames */
        int _full_written;
        /** number of FAKE written frames */
@@ -145,4 +153,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::InteropSubtitleContent> _subtitle_content;
+
+       std::list<boost::shared_ptr<Font> > _fonts;
 };