Tidy up handling of content-modified checks when using the dcpomatic_cli.

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

diff --git a/src/lib/reel_writer.h b/src/lib/reel_writer.h
index ae64c3ac77ed9c73bd6f4f6939c9f5c6710548cf..fff2e0b9ea7568d646b4ef0b18b86e5104757799 100644 (file)
--- a/src/lib/reel_writer.h
+++ b/src/lib/reel_writer.h
@@ -26,9 +26,12 @@
 #include <dcp/picture_asset_writer.h>
 #include <boost/shared_ptr.hpp>
 
+namespace dcpomatic {
+       class Font;
+}
+
 class Film;
 class Job;
-class Font;
 class AudioBuffers;
 
 namespace dcp {
@@ -50,7 +53,7 @@ class ReelWriter
 public:
        ReelWriter (
                boost::shared_ptr<const Film> film,
-               DCPTimePeriod period,
+               dcpomatic::DCPTimePeriod period,
                boost::shared_ptr<Job> job,
                int reel_index,
                int reel_count,
@@ -61,15 +64,15 @@ public:
        void fake_write (Frame frame, Eyes eyes, int size);
        void repeat_write (Frame frame, Eyes eyes);
        void write (boost::shared_ptr<const AudioBuffers> audio);
-       void write (PlayerText text, TextType type, boost::optional<DCPTextTrack> track, DCPTimePeriod period);
+       void write (PlayerText text, TextType type, boost::optional<DCPTextTrack> track, dcpomatic::DCPTimePeriod period);
 
        void finish ();
-       boost::shared_ptr<dcp::Reel> create_reel (std::list<ReferencedReelAsset> const & refs, std::list<boost::shared_ptr<Font> > const & fonts);
+       boost::shared_ptr<dcp::Reel> create_reel (std::list<ReferencedReelAsset> const & refs, std::list<boost::shared_ptr<dcpomatic::Font> > const & fonts);
        void calculate_digests (boost::function<void (float)> set_progress);
 
        Frame start () const;
 
-       DCPTimePeriod period () const {
+       dcpomatic::DCPTimePeriod period () const {
                return _period;
        }
 
@@ -96,7 +99,7 @@ private:
 
        boost::shared_ptr<const Film> _film;
 
-       DCPTimePeriod _period;
+       dcpomatic::DCPTimePeriod _period;
        /** 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 */