Allow + in DCP names for ISDCF RU rating strings.

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

diff --git a/src/lib/reel_writer.h b/src/lib/reel_writer.h
index a80f51dc255c814311ca9d4356e15cba24b5bc95..c0e98f6ebf89b7bd2bdd06858c2cd605995c1054 100644 (file)
--- a/src/lib/reel_writer.h
+++ b/src/lib/reel_writer.h
@@ -47,7 +47,14 @@ namespace dcp {
 class ReelWriter
 {
 public:
-       ReelWriter (boost::shared_ptr<const Film> film, DCPTimePeriod period, boost::shared_ptr<Job> job, int reel_index, int reel_count);
+       ReelWriter (
+               boost::shared_ptr<const Film> film,
+               DCPTimePeriod period,
+               boost::shared_ptr<Job> job,
+               int reel_index,
+               int reel_count,
+               boost::optional<std::string> content_summary
+               );
 
        void write (boost::optional<dcp::Data> encoded, Frame frame, Eyes eyes);
        void fake_write (Frame frame, Eyes eyes, int size);
@@ -65,10 +72,6 @@ public:
                return _period;
        }
 
-       int total_written_audio_frames () const {
-               return _total_written_audio_frames;
-       }
-
        int last_written_video_frame () const {
                return _last_written_video_frame;
        }
@@ -87,25 +90,24 @@ private:
 
        void write_frame_info (Frame frame, Eyes eyes, dcp::FrameInfo info) const;
        long frame_info_position (Frame frame, Eyes eyes) const;
-       void check_existing_picture_asset ();
-       bool existing_picture_frame_ok (FILE* asset_file, FILE* info_file) const;
+       Frame check_existing_picture_asset ();
+       bool existing_picture_frame_ok (FILE* asset_file, FILE* info_file, Frame frame) const;
 
        boost::shared_ptr<const Film> _film;
 
        DCPTimePeriod _period;
-       /** the first frame index that does not already exist in our MXF */
+       /** the first picture frame index that does not already exist in our MXF */
        int _first_nonexistant_frame;
        /** the data of the last written frame, if there is one */
        boost::optional<dcp::Data> _last_written[EYES_COUNT];
        /** the index of the last written video frame within the reel */
        int _last_written_video_frame;
        Eyes _last_written_eyes;
-       /** the number of audio frames that have been written to the reel */
-       int _total_written_audio_frames;
        /** index of this reel within the DCP (starting from 0) */
        int _reel_index;
        /** number of reels in the DCP */
        int _reel_count;
+       boost::optional<std::string> _content_summary;
 
        boost::shared_ptr<dcp::PictureAsset> _picture_asset;
        boost::shared_ptr<dcp::PictureAssetWriter> _picture_asset_writer;