From 8850569d93a8524625b3b595cb6edf45bdf6de07 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 20 Jan 2025 00:33:08 +0100 Subject: Pass tolerant flag into Player. This is needed because the DCPDecoder ends up needing it when it reads reel information from CPLs. Maybe all that stuff should be in our metadata. --- src/lib/player.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/lib/player.cc') diff --git a/src/lib/player.cc b/src/lib/player.cc index 1f44c961c..7048435b5 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -97,7 +97,7 @@ int const PlayerProperty::ALWAYS_BURN_OPEN_SUBTITLES = 709; int const PlayerProperty::PLAY_REFERENCED = 710; -Player::Player (shared_ptr film, Image::Alignment subtitle_alignment) +Player::Player (shared_ptr film, Image::Alignment subtitle_alignment, bool tolerant) : _film (film) , _suspended (0) , _ignore_video(false) @@ -105,7 +105,7 @@ Player::Player (shared_ptr film, Image::Alignment subtitle_alignment , _ignore_text(false) , _always_burn_open_subtitles(false) , _fast(false) - , _tolerant (film->tolerant()) + , _tolerant(tolerant) , _play_referenced(false) , _audio_merger(film->audio_frame_rate()) , _subtitle_alignment (subtitle_alignment) @@ -114,7 +114,7 @@ Player::Player (shared_ptr film, Image::Alignment subtitle_alignment } -Player::Player (shared_ptr film, shared_ptr playlist_) +Player::Player(shared_ptr film, shared_ptr playlist_, bool tolerant) : _film (film) , _playlist (playlist_) , _suspended (0) @@ -123,7 +123,7 @@ Player::Player (shared_ptr film, shared_ptr playlist , _ignore_text(false) , _always_burn_open_subtitles(false) , _fast(false) - , _tolerant (film->tolerant()) + , _tolerant(tolerant) , _play_referenced(false) , _audio_merger(film->audio_frame_rate()) { -- cgit v1.2.3