diff options
| author | Carl Hetherington <cth@carlh.net> | 2025-01-20 00:31:32 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2025-01-20 20:36:46 +0100 |
| commit | 385635f00d39822389adbc99a2d5bdd992f16432 (patch) | |
| tree | 284ad0ac65988eb102f0f6334701496213cfd7a7 /src/tools | |
| parent | 0b66748421b751b1863ce86f98ab449c8e8e87fc (diff) | |
Pass tolerant flag into Content::examine() and the ExamineContentJob.
Along the way this helps to fix #2942.
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/dcpomatic_player.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc index 15ccf0a77..0ae5acf26 100644 --- a/src/tools/dcpomatic_player.cc +++ b/src/tools/dcpomatic_player.cc @@ -404,7 +404,7 @@ public: try { _stress.set_suspended (true); auto dcp = make_shared<DCPContent>(dir); - auto job = make_shared<ExamineContentJob>(film, dcp); + auto job = make_shared<ExamineContentJob>(film, dcp, true); auto add_dcp_to_film = [this](weak_ptr<Film> weak_film, weak_ptr<Job> weak_job, weak_ptr<Content> weak_content) { @@ -579,7 +579,7 @@ private: DCPOMATIC_ASSERT (_film); auto dcp = dynamic_pointer_cast<DCPContent>(_film->content().front()); DCPOMATIC_ASSERT (dcp); - dcp->examine (_film, shared_ptr<Job>()); + dcp->examine(_film, {}, true); /* Examining content re-creates the TextContent objects, so we must re-enable them */ for (auto i: dcp->text) { @@ -733,7 +733,7 @@ private: auto dcp = std::dynamic_pointer_cast<DCPContent>(_film->content().front()); DCPOMATIC_ASSERT(dcp); dcp->add_ov (wx_to_std(c->GetPath())); - JobManager::instance()->add(make_shared<ExamineContentJob>(_film, dcp)); + JobManager::instance()->add(make_shared<ExamineContentJob>(_film, dcp, true)); bool const ok = display_progress(variant::wx::dcpomatic_player(), _("Loading content")); if (!ok || !report_errors_from_last_job(this)) { return; |