Be more careful with fread in various places.

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

diff --git a/src/lib/film.h b/src/lib/film.h
index 273077f8f5c646766eef6fc525bf302c2704ea1c..3fb24af934e5c999f84b4d49d55e1427b85c9808 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -130,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,
@@ -155,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);
@@ -204,7 +199,8 @@ public:
                AUDIO_PROCESSOR,
                REEL_TYPE,
                REEL_LENGTH,
-               UPLOAD_AFTER_MAKE_DCP
+               UPLOAD_AFTER_MAKE_DCP,
+               REENCODE_J2K
        };
 
 
@@ -296,6 +292,10 @@ public:
                return _context_id;
        }
 
+       bool reencode_j2k () const {
+               return _reencode_j2k;
+       }
+
 
        /* SET */
 
@@ -326,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;
@@ -399,6 +400,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;