Updated fr_FR translation from Thierry Journet.

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

diff --git a/src/lib/film.h b/src/lib/film.h
index 44e84dc274f34922d92b549c439586636c40c812..b77ce7a7651099dfd4334381002613b824207af4 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -94,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;
 
@@ -129,7 +130,7 @@ public:
 
        dcp::EncryptedKDM make_kdm (
                dcp::Certificate recipient,
-               std::vector<dcp::Certificate> trusted_devices,
+               std::vector<std::string> trusted_devices,
                boost::filesystem::path cpl_file,
                dcp::LocalTime from,
                dcp::LocalTime until,
@@ -154,11 +155,6 @@ public:
 
        std::string subtitle_language () const;
 
-       void make_audio_mapping_default (
-               AudioMapping & mapping,
-               boost::optional<boost::filesystem::path> filename = boost::optional<boost::filesystem::path> ()
-               ) const;
-
        std::vector<std::string> audio_output_names () const;
 
        void repeat_content (ContentList, int);
@@ -203,7 +199,8 @@ public:
                AUDIO_PROCESSOR,
                REEL_TYPE,
                REEL_LENGTH,
-               UPLOAD_AFTER_MAKE_DCP
+               UPLOAD_AFTER_MAKE_DCP,
+               REENCODE_J2K
        };
 
 
@@ -295,6 +292,10 @@ public:
                return _context_id;
        }
 
+       bool reencode_j2k () const {
+               return _reencode_j2k;
+       }
+
 
        /* SET */
 
@@ -315,7 +316,7 @@ public:
        void set_key (dcp::Key key);
        void set_j2k_bandwidth (int);
        void set_isdcf_metadata (ISDCFMetadata);
-       void set_video_frame_rate (int);
+       void set_video_frame_rate (int rate, bool user_explicit = false);
        void set_audio_channels (int);
        void set_three_d (bool);
        void set_isdcf_date_today ();
@@ -325,6 +326,7 @@ 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 is about to change or has changed */
        mutable boost::signals2::signal<void (ChangeType, Property)> Change;
@@ -332,6 +334,9 @@ public:
        /** Emitted when some property of our content has changed */
        mutable boost::signals2::signal<void (ChangeType, boost::weak_ptr<Content>, int, bool)> ContentChange;
 
+       /** Emitted when we have something important to tell the user */
+       boost::signals2::signal<void (std::string)> Message;
+
        /** Current version number of the state file */
        static int const current_state_version;
 
@@ -398,6 +403,9 @@ private:
        /** Desired reel length in bytes, if _reel_type == REELTYPE_BY_LENGTH */
        int64_t _reel_length;
        bool _upload_after_make_dcp;
+       bool _reencode_j2k;
+       /** true if the user has ever explicitly set the video frame rate of this film */
+       bool _user_explicit_video_frame_rate;
 
        int _state_version;
 
@@ -406,6 +414,7 @@ private:
        /** film being used as a template, or 0 */
        boost::shared_ptr<Film> _template_film;
 
+
        boost::signals2::scoped_connection _playlist_change_connection;
        boost::signals2::scoped_connection _playlist_order_changed_connection;
        boost::signals2::scoped_connection _playlist_content_change_connection;