diff options
| author | Carl Hetherington <cth@carlh.net> | 2026-01-28 00:12:09 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2026-02-16 01:20:17 +0100 |
| commit | 86c169fa6cc97f2e627e281b9cd75429f4eeb670 (patch) | |
| tree | d5a89c303f813deeef52bfb3c3a33857986a3ba7 /src/wx | |
| parent | a7a3f17e003bab57967e502b35e2f1b689a7f1cb (diff) | |
Remove Film from the whole examination chain.
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/content_menu.cc | 13 | ||||
| -rw-r--r-- | src/wx/content_view.cc | 2 | ||||
| -rw-r--r-- | src/wx/playlist_controls.cc | 2 |
3 files changed, 6 insertions, 11 deletions
diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc index 4892c42d0..b75c29660 100644 --- a/src/wx/content_menu.cc +++ b/src/wx/content_menu.cc @@ -399,13 +399,8 @@ ContentMenu::find_missing() void ContentMenu::re_examine() { - auto film = _film.lock(); - if (!film) { - return; - } - for (auto i: _content) { - JobManager::instance()->add(make_shared<ExamineContentJob>(film, vector<shared_ptr<Content>>{i}, false)); + JobManager::instance()->add(make_shared<ExamineContentJob>(vector<shared_ptr<Content>>{i}, false)); } } @@ -476,7 +471,7 @@ ContentMenu::kdm() auto film = _film.lock(); DCPOMATIC_ASSERT(film); - JobManager::instance()->add(make_shared<ExamineContentJob>(film, vector<shared_ptr<Content>>{dcp}, false)); + JobManager::instance()->add(make_shared<ExamineContentJob>(vector<shared_ptr<Content>>{dcp}, false)); } void @@ -494,7 +489,7 @@ ContentMenu::ov() dcp->add_ov(dialog.path()); auto film = _film.lock(); DCPOMATIC_ASSERT(film); - JobManager::instance()->add(make_shared<ExamineContentJob>(film, vector<shared_ptr<Content>>{dcp}, false)); + JobManager::instance()->add(make_shared<ExamineContentJob>(vector<shared_ptr<Content>>{dcp}, false)); } } @@ -562,7 +557,7 @@ ContentMenu::cpl_selected(wxCommandEvent& ev) auto film = _film.lock(); DCPOMATIC_ASSERT(film); - JobManager::instance()->add(make_shared<ExamineContentJob>(film, vector<shared_ptr<Content>>{dcp}, false)); + JobManager::instance()->add(make_shared<ExamineContentJob>(vector<shared_ptr<Content>>{dcp}, false)); } diff --git a/src/wx/content_view.cc b/src/wx/content_view.cc index 0bbc80535..438f53785 100644 --- a/src/wx/content_view.cc +++ b/src/wx/content_view.cc @@ -110,7 +110,7 @@ ContentView::update () } if (content) { - auto job = make_shared<ExamineContentJob>(shared_ptr<Film>(), vector<shared_ptr<Content>>{content}, false); + auto job = make_shared<ExamineContentJob>(vector<shared_ptr<Content>>{content}, false); jm->add (job); jobs.push_back (job); } diff --git a/src/wx/playlist_controls.cc b/src/wx/playlist_controls.cc index 0f5b5c0a3..d9914462c 100644 --- a/src/wx/playlist_controls.cc +++ b/src/wx/playlist_controls.cc @@ -356,7 +356,7 @@ PlaylistControls::select_playlist(int selected, int position) if (kdm) { try { dcp->add_kdm(*kdm); - dcp->examine(_film, shared_ptr<Job>(), true); + dcp->examine(shared_ptr<Job>(), true); } catch (KDMError& e) { error_dialog(this, _("Could not load KDM.")); } |
