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_menu.cc | |
| parent | c31b9542c58ae1cbfae7ec3ba4911359fd010ba2 (diff) | |
Take Film pointer out of Content.
Diffstat (limited to 'src/wx/content_menu.cc')
| -rw-r--r-- | src/wx/content_menu.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc index 6a5ca8be4..017d2c659 100644 --- a/src/wx/content_menu.cc +++ b/src/wx/content_menu.cc @@ -209,7 +209,7 @@ ContentMenu::join () } try { - shared_ptr<FFmpegContent> joined (new FFmpegContent (film, fc)); + shared_ptr<FFmpegContent> joined (new FFmpegContent(fc)); film->remove_content (_content); film->examine_and_add_content (joined); } catch (JoinError& e) { @@ -306,9 +306,9 @@ ContentMenu::find_missing () if (r == wxID_OK) { if (dc) { - content.push_back (shared_ptr<DCPContent> (new DCPContent (film, path))); + content.push_back (shared_ptr<DCPContent>(new DCPContent(path))); } else { - content = content_factory (film, path); + content = content_factory (path); } } |