Cleanup: move some methods from util to maths_util.

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

diff --git a/src/lib/film.h b/src/lib/film.h
index 85d06f64dcccbf980362dc9d528dd8c11797662c..7103f627115e51fe5a5d8305589f5601ec4e3848 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -18,23 +18,28 @@
 
 */
 
+
 /** @file  src/film.h
  *  @brief A representation of some audio and video content, and details of
  *  how they should be presented in a DCP.
  */
 
+
 #ifndef DCPOMATIC_FILM_H
 #define DCPOMATIC_FILM_H
 
+
 #include "change_signaller.h"
 #include "dcp_text_track.h"
 #include "frame_rate_change.h"
 #include "signaller.h"
+#include "transcode_job.h"
 #include "types.h"
 #include "util.h"
 #include <dcp/encrypted_kdm.h>
 #include <dcp/key.h>
 #include <dcp/language_tag.h>
+#include <dcp/rating.h>
 #include <boost/filesystem.hpp>
 #include <boost/signals2.hpp>
 #include <boost/thread.hpp>
@@ -43,6 +48,7 @@
 #include <string>
 #include <vector>
 
+
 namespace xmlpp {
        class Document;
 }
@@ -64,6 +70,7 @@ struct isdcf_name_test;
 struct recover_test_2d_encrypted;
 struct atmos_encrypted_passthrough_test;
 
+
 class InfoFileHandle
 {
 public:
@@ -111,7 +118,7 @@ public:
        boost::filesystem::path subtitle_analysis_path (std::shared_ptr<const Content>) const;
 
        void send_dcp_to_tms ();
-       void make_dcp (bool gui = false, bool check = true);
+       void make_dcp (TranscodeJob::ChangedBehaviour behaviour);
 
        /** @return Logger.
         *  It is safe to call this from any thread.
@@ -407,6 +414,9 @@ public:
                return _luminance;
        }
 
+       boost::gregorian::date isdcf_date () const {
+               return _isdcf_date;
+       }
 
        /* SET */
 
@@ -495,8 +505,6 @@ private:
        void check_settings_consistency ();
        void maybe_set_container_and_resolution ();
 
-       static std::string const metadata_file;
-
        /** Log to write to */
        std::shared_ptr<Log> _log;
        std::shared_ptr<Playlist> _playlist;