Use uchardet to guess encoding of subtitle files and reject non-UTF-8.

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

diff --git a/src/lib/writer.h b/src/lib/writer.h
index 79322bacd154ae93b8eade5eb12fdf7107b19a7f..09e4f47983cf7dd0dc08ecda422b2ee3f457e557 100644 (file)
--- a/src/lib/writer.h
+++ b/src/lib/writer.h
@@ -48,6 +48,7 @@ namespace dcp {
        class SoundAsset;
        class SoundAssetWriter;
        class SubtitleAsset;
+       class ReelAsset;
 }
 
 struct QueueItem
@@ -97,6 +98,8 @@ public:
        Writer (boost::shared_ptr<const Film>, boost::weak_ptr<Job>);
        ~Writer ();
 
+       void start ();
+
        bool can_fake_write (int) const;
 
        void write (Data, int, Eyes);
@@ -105,6 +108,7 @@ public:
        void write (boost::shared_ptr<const AudioBuffers>);
        void write (PlayerSubtitles subs);
        void write (std::list<boost::shared_ptr<Font> > fonts);
+       void write (boost::shared_ptr<dcp::ReelAsset> reel_asset);
        void finish ();
 
        void set_encoder_threads (int threads);
@@ -114,7 +118,6 @@ private:
        void thread ();
        void terminate_thread (bool);
        void check_existing_picture_asset ();
-       bool check_existing_picture_asset_frame (FILE *, int, Eyes);
        bool have_sequenced_image_at_queue_head ();
        void write_frame_info (int frame, Eyes eyes, dcp::FrameInfo info) const;
        long frame_info_position (int frame, Eyes eyes) const;
@@ -135,7 +138,7 @@ private:
        /** number of FULL frames whose JPEG200 data is currently held in RAM */
        int _queued_full_in_memory;
        /** mutex for thread state */
-       mutable boost::mutex _mutex;
+       mutable boost::mutex _state_mutex;
        /** condition to manage thread wakeups when we have nothing to do  */
        boost::condition _empty_condition;
        /** condition to manage thread wakeups when we have too much to do */
@@ -165,6 +168,9 @@ private:
        boost::shared_ptr<dcp::SoundAsset> _sound_asset;
        boost::shared_ptr<dcp::SoundAssetWriter> _sound_asset_writer;
        boost::shared_ptr<dcp::SubtitleAsset> _subtitle_asset;
+       std::list<boost::shared_ptr<dcp::ReelAsset> > _reel_assets;
 
        std::list<boost::shared_ptr<Font> > _fonts;
+
+       static int const _info_size;
 };