diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-12-12 00:30:33 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-12-12 00:30:33 +0000 |
| commit | 3c414bf90d4cfcfe342c0b057b5134f72485fe32 (patch) | |
| tree | 543e3635577f04a58f1dc252fa0b888a4daeb005 /src/wx | |
| parent | f851a375fc5bb9095def34c05a61f69e33139426 (diff) | |
Fix content properties (#1428).
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/content_menu.cc | 4 | ||||
| -rw-r--r-- | src/wx/content_properties_dialog.cc | 4 | ||||
| -rw-r--r-- | src/wx/content_properties_dialog.h | 5 |
3 files changed, 8 insertions, 5 deletions
diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc index 017d2c659..19c54abcc 100644 --- a/src/wx/content_menu.cc +++ b/src/wx/content_menu.cc @@ -415,7 +415,9 @@ ContentMenu::ov () void ContentMenu::properties () { - ContentPropertiesDialog* d = new ContentPropertiesDialog (_parent, _content.front ()); + shared_ptr<Film> film = _film.lock (); + DCPOMATIC_ASSERT (film); + ContentPropertiesDialog* d = new ContentPropertiesDialog (_parent, film, _content.front()); d->ShowModal (); d->Destroy (); } diff --git a/src/wx/content_properties_dialog.cc b/src/wx/content_properties_dialog.cc index efc0e6ef1..7dcc6f8f1 100644 --- a/src/wx/content_properties_dialog.cc +++ b/src/wx/content_properties_dialog.cc @@ -34,11 +34,11 @@ using std::map; using boost::shared_ptr; using boost::dynamic_pointer_cast; -ContentPropertiesDialog::ContentPropertiesDialog (wxWindow* parent, shared_ptr<Content> content) +ContentPropertiesDialog::ContentPropertiesDialog (wxWindow* parent, shared_ptr<const Film> film, shared_ptr<Content> content) : TableDialog (parent, _("Content Properties"), 2, 1, false) { map<UserProperty::Category, list<UserProperty> > grouped; - BOOST_FOREACH (UserProperty i, content->user_properties()) { + BOOST_FOREACH (UserProperty i, content->user_properties(film)) { if (grouped.find(i.category) == grouped.end()) { grouped[i.category] = list<UserProperty> (); } diff --git a/src/wx/content_properties_dialog.h b/src/wx/content_properties_dialog.h index 92aa5c6d7..5d0cd4630 100644 --- a/src/wx/content_properties_dialog.h +++ b/src/wx/content_properties_dialog.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2016 Carl Hetherington <cth@carlh.net> + Copyright (C) 2015-2018 Carl Hetherington <cth@carlh.net> This file is part of DCP-o-matic. @@ -25,12 +25,13 @@ #include <map> class Content; +class Film; class UserProperty; class ContentPropertiesDialog : public TableDialog { public: - ContentPropertiesDialog (wxWindow* parent, boost::shared_ptr<Content> content); + ContentPropertiesDialog (wxWindow* parent, boost::shared_ptr<const Film> film, boost::shared_ptr<Content> content); private: void maybe_add_group (std::map<UserProperty::Category, std::list<UserProperty> > const & groups, UserProperty::Category category); |