diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-12-06 21:36:37 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-12-07 01:20:25 +0100 |
| commit | dfb68bf9190ec0be31f01b61c17aebc8b6e30ad8 (patch) | |
| tree | 7df185b2773729f244ab19622f10eb5f746b661f /src/wx | |
| parent | 7c27dff5817715965e86798108c596f9a1675394 (diff) | |
Add WeakFilm and WeakConstFilm and use them a bit.
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/smpte_metadata_dialog.cc | 11 | ||||
| -rw-r--r-- | src/wx/smpte_metadata_dialog.h | 5 |
2 files changed, 3 insertions, 13 deletions
diff --git a/src/wx/smpte_metadata_dialog.cc b/src/wx/smpte_metadata_dialog.cc index 156f82ab5..87be156f5 100644 --- a/src/wx/smpte_metadata_dialog.cc +++ b/src/wx/smpte_metadata_dialog.cc @@ -66,7 +66,7 @@ content_versions_column (string v, int) SMPTEMetadataDialog::SMPTEMetadataDialog (wxWindow* parent, weak_ptr<Film> weak_film) : wxDialog (parent, wxID_ANY, _("Metadata")) - , _film (weak_film) + , WeakFilm (weak_film) { wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL); SetSizer (overall_sizer); @@ -367,15 +367,6 @@ SMPTEMetadataDialog::edit_release_territory () } -shared_ptr<Film> -SMPTEMetadataDialog::film () const -{ - shared_ptr<Film> film = _film.lock (); - DCPOMATIC_ASSERT (film); - return film; -} - - void SMPTEMetadataDialog::version_number_changed () { diff --git a/src/wx/smpte_metadata_dialog.h b/src/wx/smpte_metadata_dialog.h index 36039c501..0f9c436b9 100644 --- a/src/wx/smpte_metadata_dialog.h +++ b/src/wx/smpte_metadata_dialog.h @@ -21,6 +21,7 @@ #include "editable_list.h" #include "language_tag_dialog.h" #include "lib/film.h" +#include "lib/weak_film.h" #include <dcp/language_tag.h> #include <dcp/types.h> #include <wx/wx.h> @@ -35,7 +36,7 @@ class ContentVersionDialog; class LanguageTagWidget; -class SMPTEMetadataDialog : public wxDialog +class SMPTEMetadataDialog : public wxDialog, public WeakFilm { public: SMPTEMetadataDialog (wxWindow* parent, boost::weak_ptr<Film> film); @@ -60,9 +61,7 @@ private: void luminance_changed (); void film_changed (ChangeType type, Film::Property property); void setup_sensitivity (); - boost::shared_ptr<Film> film () const; - boost::weak_ptr<Film> _film; LanguageTagWidget* _name_language; LanguageTagWidget* _audio_language; wxCheckBox* _enable_main_subtitle_language; |