diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-05-13 21:52:27 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-05-13 21:52:27 +0100 |
| commit | 006e38346a8bcdcc889979b7c00802d9bb8fc6f8 (patch) | |
| tree | 352caad1d2863ef4385b0d91fa7de07f52ff5e27 /src/wx | |
| parent | 6cde6bcc0b604c1a157a4ccbdce29e91f4d45a91 (diff) | |
swaroop: allow ScreenKDM subclasses for different KDM types.
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/kdm_dialog.cc | 2 | ||||
| -rw-r--r-- | src/wx/kdm_output_panel.cc | 2 | ||||
| -rw-r--r-- | src/wx/kdm_output_panel.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc index 920f54a3e..55b89a371 100644 --- a/src/wx/kdm_dialog.cc +++ b/src/wx/kdm_dialog.cc @@ -149,7 +149,7 @@ KDMDialog::make_clicked () shared_ptr<const Film> film = _film.lock (); DCPOMATIC_ASSERT (film); - list<ScreenKDM> screen_kdms; + list<shared_ptr<ScreenKDM> > screen_kdms; try { screen_kdms = film->make_kdms ( diff --git a/src/wx/kdm_output_panel.cc b/src/wx/kdm_output_panel.cc index 876329123..181ca74f4 100644 --- a/src/wx/kdm_output_panel.cc +++ b/src/wx/kdm_output_panel.cc @@ -181,7 +181,7 @@ KDMOutputPanel::kdm_write_type_changed () pair<shared_ptr<Job>, int> KDMOutputPanel::make ( - list<ScreenKDM> screen_kdms, string name, KDMTimingPanel* timing, function<bool (boost::filesystem::path)> confirm_overwrite + list<shared_ptr<ScreenKDM> > screen_kdms, string name, KDMTimingPanel* timing, function<bool (boost::filesystem::path)> confirm_overwrite ) { list<CinemaKDMs> const cinema_kdms = CinemaKDMs::collect (screen_kdms); diff --git a/src/wx/kdm_output_panel.h b/src/wx/kdm_output_panel.h index ed162e053..c52fa7a15 100644 --- a/src/wx/kdm_output_panel.h +++ b/src/wx/kdm_output_panel.h @@ -49,7 +49,7 @@ public: } std::pair<boost::shared_ptr<Job>, int> make ( - std::list<ScreenKDM> screen_kdms, + std::list<boost::shared_ptr<ScreenKDM> > screen_kdms, std::string name, KDMTimingPanel* timing, boost::function<bool (boost::filesystem::path)> confirm_overwrite |