diff options
| author | Carl Hetherington <cth@carlh.net> | 2025-07-15 03:36:59 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2025-07-15 18:03:57 +0200 |
| commit | 21415bdb69a99c4fc36cf4b5e5160a171bb1cad4 (patch) | |
| tree | 46265de6587585d292ac4c97267327af0c359c1c /src/wx/content_panel.cc | |
| parent | 6207d271effad4e691a5155ccdad083e03b010bc (diff) | |
Change Film::examine_and_add_content to take a vector of content.
Diffstat (limited to 'src/wx/content_panel.cc')
| -rw-r--r-- | src/wx/content_panel.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc index 06a257dbb..5803c3257 100644 --- a/src/wx/content_panel.cc +++ b/src/wx/content_panel.cc @@ -665,8 +665,9 @@ ContentPanel::add_folder(boost::filesystem::path folder) ic->set_video_frame_rate(_film, dialog.frame_rate()); } - _film->examine_and_add_content(i); } + + _film->examine_and_add_content(content); } @@ -684,7 +685,7 @@ void ContentPanel::add_dcp(boost::filesystem::path dcp) { try { - _film->examine_and_add_content(make_shared<DCPContent>(dcp)); + _film->examine_and_add_content({make_shared<DCPContent>(dcp)}); } catch (ProjectFolderError &) { error_dialog( _parent, @@ -963,9 +964,7 @@ ContentPanel::add_files(vector<boost::filesystem::path> paths) try { for (auto i: paths) { - for (auto j: content_factory(i)) { - _film->examine_and_add_content(j); - } + _film->examine_and_add_content(content_factory(i)); } } catch (exception& e) { error_dialog(_parent, std_to_wx(e.what())); |