summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/lib/analyse_audio_job.cc2
-rw-r--r--src/lib/analyse_subtitles_job.cc2
-rw-r--r--src/lib/film_encoder.cc2
-rw-r--r--src/lib/hints.cc2
-rw-r--r--src/lib/player.cc8
-rw-r--r--src/lib/player.h4
-rw-r--r--src/tools/dcpomatic_player.cc2
-rw-r--r--src/tools/server_test.cc2
-rw-r--r--src/wx/film_viewer.cc2
9 files changed, 13 insertions, 13 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;
diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index 0ae5acf26..30318175b 100644
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -790,7 +790,7 @@ private:
auto path = boost::filesystem::path (wx_to_std(dialog.GetPath()));
- auto player = make_shared<Player>(_film, Image::Alignment::PADDED);
+ auto player = make_shared<Player>(_film, Image::Alignment::PADDED, true);
player->seek(_viewer.position(), true);
bool done = false;
diff --git a/src/tools/server_test.cc b/src/tools/server_test.cc
index ff3295599..e7c14ab56 100644
--- a/src/tools/server_test.cc
+++ b/src/tools/server_test.cc
@@ -155,7 +155,7 @@ main (int argc, char* argv[])
film = make_shared<Film>(film_dir);
film->read_metadata ();
- auto player = make_shared<Player>(film, Image::Alignment::COMPACT);
+ auto player = make_shared<Player>(film, Image::Alignment::COMPACT, false);
player->Video.connect (bind(&process_video, _1));
while (!player->pass ()) {}
} catch (std::exception& e) {
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 9edd4578e..a7a2ab984 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -171,7 +171,7 @@ FilmViewer::set_film (shared_ptr<Film> film)
}
try {
- _player.emplace(_film, _optimisation == Optimisation::NONE ? Image::Alignment::PADDED : Image::Alignment::COMPACT);
+ _player.emplace(_film, _optimisation == Optimisation::NONE ? Image::Alignment::PADDED : Image::Alignment::COMPACT, true);
_player->set_fast ();
if (_dcp_decode_reduction) {
_player->set_dcp_decode_reduction (_dcp_decode_reduction);
generated by cgit v1.2.3 (git 2.46.0) at 2026-04-20 15:53:28 +0000