diff options
| author | Carl Hetherington <cth@carlh.net> | 2025-01-20 00:33:57 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2025-01-20 20:36:46 +0100 |
| commit | 0dc671756f9a6b0213b4273a8933c8f57483c424 (patch) | |
| tree | cce42f60e414a6764211973c8fecd7bc37e599f8 | |
| parent | 8850569d93a8524625b3b595cb6edf45bdf6de07 (diff) | |
Remove the strange tolerant flag in Film.
Instead, we now pass it in directly to Content::examine() and the
Player.
| -rw-r--r-- | src/lib/dcp_content.cc | 4 | ||||
| -rw-r--r-- | src/lib/film.cc | 1 | ||||
| -rw-r--r-- | src/lib/film.h | 13 | ||||
| -rw-r--r-- | src/tools/dcpomatic_player.cc | 1 |
4 files changed, 2 insertions, 17 deletions
diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc index ae2a08c29..32b97b06f 100644 --- a/src/lib/dcp_content.cc +++ b/src/lib/dcp_content.cc @@ -608,8 +608,8 @@ DCPContent::reels (shared_ptr<const Film> film) const if (reel_lengths.empty()) { /* Old metadata with no reel lengths; get them here instead */ try { - scoped_ptr<DCPExaminer> examiner (new DCPExaminer(shared_from_this(), film->tolerant())); - reel_lengths = examiner->reel_lengths (); + DCPExaminer examiner(shared_from_this(), true); + reel_lengths = examiner.reel_lengths(); } catch (...) { /* Could not examine the DCP; guess reels */ reel_lengths.push_back (length_after_trim(film).frames_round(film->video_frame_rate())); diff --git a/src/lib/film.cc b/src/lib/film.cc index dd702a3fd..abe8f4c3b 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -192,7 +192,6 @@ Film::Film (optional<boost::filesystem::path> dir) , _audio_language(Config::instance()->default_audio_language()) , _state_version (current_state_version) , _dirty (false) - , _tolerant (false) { set_isdcf_date_today (); diff --git a/src/lib/film.h b/src/lib/film.h index aeb389cde..7b3e2872b 100644 --- a/src/lib/film.h +++ b/src/lib/film.h @@ -196,14 +196,6 @@ public: bool references_dcp_audio () const; bool contains_atmos_content () const; - void set_tolerant (bool t) { - _tolerant = t; - } - - bool tolerant () const { - return _tolerant; - } - bool last_written_by_earlier_than(int major, int minor, int micro) const; /* GET */ @@ -571,11 +563,6 @@ private: /** film being used as a template, or 0 */ std::shared_ptr<Film> _template_film; - /** Be tolerant of errors in content (currently applies to DCP only). - Not saved as state. - */ - bool _tolerant; - std::map<std::string, std::string> _ui_state; boost::signals2::scoped_connection _playlist_change_connection; diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc index 30318175b..a3bb1693a 100644 --- a/src/tools/dcpomatic_player.cc +++ b/src/tools/dcpomatic_player.cc @@ -478,7 +478,6 @@ public: void reset_film (shared_ptr<Film> film = shared_ptr<Film>(new Film(optional<boost::filesystem::path>()))) { _film = film; - _film->set_tolerant (true); _film->set_audio_channels (MAX_DCP_AUDIO_CHANNELS); _viewer.set_film(_film); _controls->set_film (_film); |