Be more careful about allowing possibly-trouble-causing characters in DCP filenames.

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

diff --git a/src/lib/reel_writer.h b/src/lib/reel_writer.h
index 6e27171ecb0d9fb37f39331e8a0fb285e9dac316..274f62b9fa0d8cf7af1440a18304e63f118ba857 100644 (file)
--- a/src/lib/reel_writer.h
+++ b/src/lib/reel_writer.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -47,7 +47,14 @@ namespace dcp {
 class ReelWriter
 {
 public:
-       ReelWriter (boost::shared_ptr<const Film> film, DCPTimePeriod period, boost::shared_ptr<Job> job);
+       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);
@@ -57,7 +64,7 @@ public:
 
        void finish ();
        boost::shared_ptr<dcp::Reel> create_reel (std::list<ReferencedReelAsset> const & refs, std::list<boost::shared_ptr<Font> > const & fonts);
-       void calculate_digests (boost::shared_ptr<Job> job);
+       void calculate_digests (boost::function<void (float)> set_progress);
 
        Frame start () const;
 
@@ -102,6 +109,11 @@ private:
        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;