Make player more tolerant of some DCP errors.

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

diff --git a/src/lib/film.h b/src/lib/film.h
index 7fdd4d269eaa8c679002a13bdb3f81c4a8cc743b..6f1294b29c9a0f25bb02ff53df9deb40796913cd 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -45,12 +45,15 @@ namespace xmlpp {
        class Document;
 }
 
+namespace dcpomatic {
+       class Screen;
+}
+
 class DCPContentType;
 class Log;
 class Content;
 class Playlist;
 class AudioContent;
-class Screen;
 class AudioProcessor;
 class AudioMapping;
 class Ratio;
@@ -71,15 +74,15 @@ public:
        explicit Film (boost::optional<boost::filesystem::path> dir);
        ~Film ();
 
-       boost::filesystem::path info_file (DCPTimePeriod p) const;
+       boost::filesystem::path info_file (dcpomatic::DCPTimePeriod p) const;
        boost::filesystem::path j2c_path (int, Frame, Eyes, bool) const;
        boost::filesystem::path internal_video_asset_dir () const;
-       boost::filesystem::path internal_video_asset_filename (DCPTimePeriod p) const;
+       boost::filesystem::path internal_video_asset_filename (dcpomatic::DCPTimePeriod p) const;
 
        boost::filesystem::path audio_analysis_path (boost::shared_ptr<const Playlist>) const;
 
        void send_dcp_to_tms ();
-       void make_dcp ();
+       void make_dcp (bool gui = false, bool check = true);
 
        /** @return Logger.
         *  It is safe to call this from any thread.
@@ -123,9 +126,9 @@ public:
        /* Proxies for some Playlist methods */
 
        ContentList content () const;
-       DCPTime length () const;
+       dcpomatic::DCPTime length () const;
        int best_video_frame_rate () const;
-       FrameRateChange active_frame_rate_change (DCPTime) const;
+       FrameRateChange active_frame_rate_change (dcpomatic::DCPTime) const;
        std::pair<double, double> speed_up_range (int dcp_frame_rate) const;
 
        dcp::EncryptedKDM make_kdm (
@@ -139,8 +142,8 @@ public:
                boost::optional<int> disable_forensic_marking_audio
                ) const;
 
-       std::list<ScreenKDM> make_kdms (
-               std::list<boost::shared_ptr<Screen> > screens,
+       std::list<boost::shared_ptr<ScreenKDM> > make_kdms (
+               std::list<boost::shared_ptr<dcpomatic::Screen> > screens,
                boost::filesystem::path cpl_file,
                boost::posix_time::ptime from,
                boost::posix_time::ptime until,
@@ -163,14 +166,22 @@ public:
                return _playlist;
        }
 
-       std::list<DCPTimePeriod> reels () const;
+       std::list<dcpomatic::DCPTimePeriod> reels () const;
        std::list<int> mapped_audio_channels () const;
 
-       std::string content_summary (DCPTimePeriod period) const;
+       std::string content_summary (dcpomatic::DCPTimePeriod period) const;
 
        bool references_dcp_video () const;
        bool references_dcp_audio () const;
 
+       void set_tolerant (bool t) {
+               _tolerant = t;
+       }
+
+       bool tolerant () const {
+               return _tolerant;
+       }
+
        /** Identifiers for the parts of our state;
            used for signalling changes.
        */
@@ -200,7 +211,9 @@ public:
                REEL_TYPE,
                REEL_LENGTH,
                UPLOAD_AFTER_MAKE_DCP,
-               REENCODE_J2K
+               REENCODE_J2K,
+               MARKERS,
+               RATINGS
        };
 
 
@@ -296,6 +309,14 @@ public:
                return _reencode_j2k;
        }
 
+       boost::optional<dcpomatic::DCPTime> marker (dcp::Marker type) const;
+       std::map<dcp::Marker, dcpomatic::DCPTime> markers () const {
+               return _markers;
+       }
+
+       std::vector<dcp::Rating> ratings () const {
+               return _ratings;
+       }
 
        /* SET */
 
@@ -327,6 +348,9 @@ public:
        void set_reel_length (int64_t);
        void set_upload_after_make_dcp (bool);
        void set_reencode_j2k (bool);
+       void set_marker (dcp::Marker type, dcpomatic::DCPTime time);
+       void unset_marker (dcp::Marker type);
+       void set_ratings (std::vector<dcp::Rating> r);
 
        /** Emitted when some property has of the Film is about to change or has changed */
        mutable boost::signals2::signal<void (ChangeType, Property)> Change;
@@ -334,6 +358,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;
 
@@ -403,6 +430,8 @@ private:
        bool _reencode_j2k;
        /** true if the user has ever explicitly set the video frame rate of this film */
        bool _user_explicit_video_frame_rate;
+       std::map<dcp::Marker, dcpomatic::DCPTime> _markers;
+       std::vector<dcp::Rating> _ratings;
 
        int _state_version;
 
@@ -411,6 +440,10 @@ private:
        /** film being used as a template, or 0 */
        boost::shared_ptr<Film> _template_film;
 
+       /** Be tolerant of errors in content (currently applies to DCP only).
+           Not saved as state.
+       */
+       bool _tolerant;
 
        boost::signals2::scoped_connection _playlist_change_connection;
        boost::signals2::scoped_connection _playlist_order_changed_connection;