diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-11-21 01:59:04 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-11-21 01:59:04 +0000 |
| commit | 254b3044d72de6b033d7c584f5abd2b9aa70aad5 (patch) | |
| tree | 8a5c83c1b2dea690672663dedb2f3aa50f4473dc /src/wx/content_panel.cc | |
| parent | c31b9542c58ae1cbfae7ec3ba4911359fd010ba2 (diff) | |
Take Film pointer out of Content.
Diffstat (limited to 'src/wx/content_panel.cc')
| -rw-r--r-- | src/wx/content_panel.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc index 8e6c49294..93b270faa 100644 --- a/src/wx/content_panel.cc +++ b/src/wx/content_panel.cc @@ -450,7 +450,7 @@ ContentPanel::add_folder_clicked () list<shared_ptr<Content> > content; try { - content = content_factory (_film, path); + content = content_factory (path); } catch (exception& e) { error_dialog (_parent, e.what()); return; @@ -493,7 +493,7 @@ ContentPanel::add_dcp_clicked () } try { - _film->examine_and_add_content (shared_ptr<Content> (new DCPContent (_film, path))); + _film->examine_and_add_content (shared_ptr<Content> (new DCPContent (path))); } catch (exception& e) { error_dialog (_parent, e.what()); } @@ -755,7 +755,7 @@ ContentPanel::add_files (list<boost::filesystem::path> paths) try { BOOST_FOREACH (boost::filesystem::path i, paths) { - BOOST_FOREACH (shared_ptr<Content> j, content_factory (_film, i)) { + BOOST_FOREACH (shared_ptr<Content> j, content_factory(i)) { _film->examine_and_add_content (j); } } |