diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-05-04 22:53:08 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-05-06 20:15:16 +0200 |
| commit | 36ce958a516567d8481163692c028a88c6ce0df7 (patch) | |
| tree | 10bd8a9470e3f83b69766c2afbe366f4824a8954 /src/wx | |
| parent | 08f96200aacf9f91ef3e3f5b80224a5b2437f279 (diff) | |
Rename ScreenKDM -> KDMWithMetadata
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/kdm_dialog.cc | 6 | ||||
| -rw-r--r-- | src/wx/kdm_output_panel.cc | 4 | ||||
| -rw-r--r-- | src/wx/kdm_output_panel.h | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc index 59d961e6c..06600ac7a 100644 --- a/src/wx/kdm_dialog.cc +++ b/src/wx/kdm_dialog.cc @@ -29,7 +29,7 @@ #include "dcpomatic_button.h" #include "lib/film.h" #include "lib/screen.h" -#include "lib/screen_kdm.h" +#include "lib/kdm_with_metadata.h" #include "lib/job_manager.h" #include "lib/cinema_kdms.h" #include "lib/config.h" @@ -150,7 +150,7 @@ KDMDialog::make_clicked () shared_ptr<const Film> film = _film.lock (); DCPOMATIC_ASSERT (film); - list<shared_ptr<ScreenKDM> > screen_kdms; + list<shared_ptr<KDMWithMetadata> > screen_kdms; try { /* Start off by enabling forensic marking for all */ optional<int> for_audio; @@ -175,7 +175,7 @@ KDMDialog::make_clicked () for_audio ); - screen_kdms.push_back (shared_ptr<ScreenKDM>(new DCPScreenKDM(i, kdm))); + screen_kdms.push_back (shared_ptr<KDMWithMetadata>(new DCPKDMWithMetadata(i, kdm))); } } diff --git a/src/wx/kdm_output_panel.cc b/src/wx/kdm_output_panel.cc index d76a27359..0320ed1b7 100644 --- a/src/wx/kdm_output_panel.cc +++ b/src/wx/kdm_output_panel.cc @@ -183,7 +183,7 @@ KDMOutputPanel::kdm_write_type_changed () pair<shared_ptr<Job>, int> KDMOutputPanel::make ( - list<shared_ptr<ScreenKDM> > screen_kdms, string name, KDMTimingPanel* timing, function<bool (boost::filesystem::path)> confirm_overwrite + list<shared_ptr<KDMWithMetadata> > screen_kdms, string name, KDMTimingPanel* timing, function<bool (boost::filesystem::path)> confirm_overwrite ) { list<CinemaKDMs> const cinema_kdms = CinemaKDMs::collect (screen_kdms); @@ -247,7 +247,7 @@ KDMOutputPanel::make ( if (_write_to->GetValue()) { if (_write_flat->GetValue()) { - written = ScreenKDM::write_files ( + written = KDMWithMetadata::write_files ( screen_kdms, directory(), _filename_format->get(), diff --git a/src/wx/kdm_output_panel.h b/src/wx/kdm_output_panel.h index 7b9315071..730cb9360 100644 --- a/src/wx/kdm_output_panel.h +++ b/src/wx/kdm_output_panel.h @@ -18,7 +18,7 @@ */ -#include "lib/screen_kdm.h" +#include "lib/kdm_with_metadata.h" #include "wx_util.h" #include "name_format_editor.h" #include <dcp/types.h> @@ -52,7 +52,7 @@ public: } std::pair<boost::shared_ptr<Job>, int> make ( - std::list<boost::shared_ptr<ScreenKDM> > screen_kdms, + std::list<boost::shared_ptr<KDMWithMetadata> > screen_kdms, std::string name, KDMTimingPanel* timing, boost::function<bool (boost::filesystem::path)> confirm_overwrite |