diff options
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/analyse_audio_job.cc | 2 | ||||
| -rw-r--r-- | src/lib/analyse_subtitles_job.cc | 2 | ||||
| -rw-r--r-- | src/lib/film_encoder.cc | 2 | ||||
| -rw-r--r-- | src/lib/hints.cc | 2 | ||||
| -rw-r--r-- | src/lib/player.cc | 8 | ||||
| -rw-r--r-- | src/lib/player.h | 4 |
6 files changed, 10 insertions, 10 deletions
diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc index a6ce5dcc8..a9a7dfabd 100644 --- a/src/lib/analyse_audio_job.cc +++ b/src/lib/analyse_audio_job.cc @@ -87,7 +87,7 @@ AnalyseAudioJob::run () { LOG_DEBUG_AUDIO_ANALYSIS_NC("AnalyseAudioJob::run"); - auto player = make_shared<Player>(_film, _playlist); + auto player = make_shared<Player>(_film, _playlist, false); player->set_ignore_video (); player->set_ignore_text (); player->set_fast (); diff --git a/src/lib/analyse_subtitles_job.cc b/src/lib/analyse_subtitles_job.cc index b2346d4d9..66db25f04 100644 --- a/src/lib/analyse_subtitles_job.cc +++ b/src/lib/analyse_subtitles_job.cc @@ -78,7 +78,7 @@ AnalyseSubtitlesJob::run () DCPOMATIC_ASSERT (content); playlist->add (_film, content); - auto player = make_shared<Player>(_film, playlist); + auto player = make_shared<Player>(_film, playlist, false); player->set_ignore_audio (); player->set_fast (); player->set_play_referenced (); diff --git a/src/lib/film_encoder.cc b/src/lib/film_encoder.cc index 05b911daf..33f7ea3cd 100644 --- a/src/lib/film_encoder.cc +++ b/src/lib/film_encoder.cc @@ -41,7 +41,7 @@ FilmEncoder::FilmEncoder(std::shared_ptr<const Film> film, std::weak_ptr<Job> job) : _film (film) , _job (job) - , _player(film, Image::Alignment::PADDED) + , _player(film, Image::Alignment::PADDED, false) { } diff --git a/src/lib/hints.cc b/src/lib/hints.cc index 1ad4a4834..730a167d2 100644 --- a/src/lib/hints.cc +++ b/src/lib/hints.cc @@ -418,7 +418,7 @@ Hints::scan_content(shared_ptr<const Film> film) emit(boost::bind(boost::ref(Progress), _("Examining audio, subtitles and closed captions"))); } - auto player = make_shared<Player>(film, Image::Alignment::COMPACT); + auto player = make_shared<Player>(film, Image::Alignment::COMPACT, false); player->set_ignore_video(); if (check_loudness_done || _disable_audio_analysis) { /* We don't need to analyse audio because we already loaded a suitable analysis */ 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<const Film> film, Image::Alignment subtitle_alignment) +Player::Player (shared_ptr<const Film> film, Image::Alignment subtitle_alignment, bool tolerant) : _film (film) , _suspended (0) , _ignore_video(false) @@ -105,7 +105,7 @@ Player::Player (shared_ptr<const Film> 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<const Film> film, Image::Alignment subtitle_alignment } -Player::Player (shared_ptr<const Film> film, shared_ptr<const Playlist> playlist_) +Player::Player(shared_ptr<const Film> film, shared_ptr<const Playlist> playlist_, bool tolerant) : _film (film) , _playlist (playlist_) , _suspended (0) @@ -123,7 +123,7 @@ Player::Player (shared_ptr<const Film> film, shared_ptr<const Playlist> 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()) { diff --git a/src/lib/player.h b/src/lib/player.h index eba206c9b..2faffe971 100644 --- a/src/lib/player.h +++ b/src/lib/player.h @@ -79,8 +79,8 @@ public: class Player { public: - Player (std::shared_ptr<const Film>, Image::Alignment subtitle_alignment); - Player (std::shared_ptr<const Film>, std::shared_ptr<const Playlist> playlist); + Player(std::shared_ptr<const Film>, Image::Alignment subtitle_alignment, bool tolerant); + Player(std::shared_ptr<const Film>, std::shared_ptr<const Playlist> playlist, bool tolerant); Player (Player const&) = delete; Player& operator= (Player const&) = delete; |