Add button to force re-encode of J2K content.

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

diff --git a/src/lib/film.h b/src/lib/film.h
index 0aa3dab3f05a7388b7c0a6f02062321b366b956f..d251c7fcc3e6ddef4e70e729285b96323d8bd5e0 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -31,6 +31,7 @@
 #include "isdcf_metadata.h"
 #include "frame_rate_change.h"
 #include "signaller.h"
+#include "dcp_text_track.h"
 #include <dcp/key.h>
 #include <dcp/encrypted_kdm.h>
 #include <boost/signals2.hpp>
@@ -67,7 +68,7 @@ struct isdcf_name_test;
 class Film : public boost::enable_shared_from_this<Film>, public Signaller, public boost::noncopyable
 {
 public:
-       Film (boost::optional<boost::filesystem::path> dir);
+       explicit Film (boost::optional<boost::filesystem::path> dir);
        ~Film ();
 
        boost::filesystem::path info_file (DCPTimePeriod p) const;
@@ -93,6 +94,7 @@ public:
        void use_template (std::string name);
        std::list<std::string> read_metadata (boost::optional<boost::filesystem::path> path = boost::optional<boost::filesystem::path> ());
        void write_metadata () const;
+       void write_metadata (boost::filesystem::path path) const;
        void write_template (boost::filesystem::path path) const;
        boost::shared_ptr<xmlpp::Document> metadata (bool with_content_paths = true) const;
 
@@ -113,6 +115,8 @@ public:
 
        int audio_frame_rate () const;
 
+       std::list<DCPTextTrack> closed_caption_tracks () const;
+
        uint64_t required_disk_space () const;
        bool should_be_enough_disk_space (double& required, double& available, bool& can_hard_link) const;
 
@@ -130,7 +134,9 @@ public:
                boost::filesystem::path cpl_file,
                dcp::LocalTime from,
                dcp::LocalTime until,
-               dcp::Formulation formulation
+               dcp::Formulation formulation,
+               bool disable_forensic_marking_picture,
+               boost::optional<int> disable_forensic_marking_audio
                ) const;
 
        std::list<ScreenKDM> make_kdms (
@@ -138,7 +144,9 @@ public:
                boost::filesystem::path cpl_file,
                boost::posix_time::ptime from,
                boost::posix_time::ptime until,
-               dcp::Formulation formulation
+               dcp::Formulation formulation,
+               bool disable_forensic_marking_picture,
+               boost::optional<int> disable_forensic_marking_audio
                ) const;
 
        int state_version () const {
@@ -165,7 +173,8 @@ public:
 
        std::string content_summary (DCPTimePeriod period) const;
 
-       std::list<std::string> fix_conflicting_settings ();
+       bool references_dcp_video () const;
+       bool references_dcp_audio () const;
 
        /** Identifiers for the parts of our state;
            used for signalling changes.
@@ -195,7 +204,8 @@ public:
                AUDIO_PROCESSOR,
                REEL_TYPE,
                REEL_LENGTH,
-               UPLOAD_AFTER_MAKE_DCP
+               UPLOAD_AFTER_MAKE_DCP,
+               REENCODE_J2K
        };
 
 
@@ -287,6 +297,10 @@ public:
                return _context_id;
        }
 
+       bool reencode_j2k () const {
+               return _reencode_j2k;
+       }
+
 
        /* SET */
 
@@ -317,12 +331,13 @@ public:
        void set_reel_type (ReelType);
        void set_reel_length (int64_t);
        void set_upload_after_make_dcp (bool);
+       void set_reencode_j2k (bool);
 
-       /** Emitted when some property has of the Film has changed */
-       mutable boost::signals2::signal<void (Property)> Changed;
+       /** Emitted when some property has of the Film is about to change or has changed */
+       mutable boost::signals2::signal<void (ChangeType, Property)> Change;
 
        /** Emitted when some property of our content has changed */
-       mutable boost::signals2::signal<void (boost::weak_ptr<Content>, int, bool)> ContentChanged;
+       mutable boost::signals2::signal<void (ChangeType, boost::weak_ptr<Content>, int, bool)> ContentChange;
 
        /** Current version number of the state file */
        static int const current_state_version;
@@ -330,12 +345,14 @@ public:
 private:
 
        friend struct ::isdcf_name_test;
+       template <typename> friend class ChangeSignaller;
 
-       void signal_changed (Property);
+       void signal_change (ChangeType, Property);
+       void signal_change (ChangeType, int);
        std::string video_identifier () const;
-       void playlist_changed ();
+       void playlist_change (ChangeType);
        void playlist_order_changed ();
-       void playlist_content_changed (boost::weak_ptr<Content>, int, bool frequent);
+       void playlist_content_change (ChangeType type, boost::weak_ptr<Content>, int, bool frequent);
        void maybe_add_content (boost::weak_ptr<Job>, boost::weak_ptr<Content>, bool disable_audio_analysis);
        void audio_analysis_finished ();
 
@@ -388,6 +405,7 @@ private:
        /** Desired reel length in bytes, if _reel_type == REELTYPE_BY_LENGTH */
        int64_t _reel_length;
        bool _upload_after_make_dcp;
+       bool _reencode_j2k;
 
        int _state_version;
 
@@ -396,9 +414,9 @@ private:
        /** film being used as a template, or 0 */
        boost::shared_ptr<Film> _template_film;
 
-       boost::signals2::scoped_connection _playlist_changed_connection;
+       boost::signals2::scoped_connection _playlist_change_connection;
        boost::signals2::scoped_connection _playlist_order_changed_connection;
-       boost::signals2::scoped_connection _playlist_content_changed_connection;
+       boost::signals2::scoped_connection _playlist_content_change_connection;
        std::list<boost::signals2::connection> _job_connections;
        std::list<boost::signals2::connection> _audio_analysis_connections;