diff options
| author | Carl Hetherington <cth@carlh.net> | 2026-01-28 00:12:09 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2026-01-29 00:20:31 +0100 |
| commit | a8156cb37d0e9aae7880f6a2bac54c1160276093 (patch) | |
| tree | 108bda5a6e4c14506d67e69a2f54f066593d378d /src/tools | |
| parent | e2ef0b3973d611978dd83135eb705cdf75437494 (diff) | |
Remove Film from the whole examination chain.
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 415dbf3ba..5f6d44704 100644 --- a/src/tools/dcpomatic_player.cc +++ b/src/tools/dcpomatic_player.cc @@ -443,7 +443,7 @@ public: }; auto dcp = make_shared<DCPContent>(dir); - auto job = make_shared<ExamineContentJob>(film, vector<shared_ptr<Content>>{dcp}, true); + auto job = make_shared<ExamineContentJob>(vector<shared_ptr<Content>>{dcp}, true); _examine_job_connection = job->Finished.connect(boost::bind<void>(setup, weak_ptr<Film>(film), weak_ptr<Job>(job), weak_ptr<Content>(dcp))); JobManager::instance()->add(job); bool const ok = display_progress(variant::wx::dcpomatic_player(), _("Loading content")); @@ -630,7 +630,7 @@ private: DCPOMATIC_ASSERT(_film); auto dcp = dynamic_pointer_cast<DCPContent>(_film->content().front()); DCPOMATIC_ASSERT(dcp); - dcp->examine(_film, {}, true); + dcp->examine({}, true); /* Examining content re-creates the TextContent objects, so we must re-enable them */ for (auto i: dcp->text) { @@ -796,7 +796,7 @@ private: return; } - auto job = make_shared<ExamineContentJob>(_film, vector<shared_ptr<Content>>{dcp}, true); + auto job = make_shared<ExamineContentJob>(vector<shared_ptr<Content>>{dcp}, true); _examine_job_connection = job->Finished.connect(boost::bind(&DOMFrame::prepare_to_play_film, this, Config::instance()->player_crop_output_ratio())); JobManager::instance()->add(job); |