diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-05-05 14:16:36 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-05-06 20:15:39 +0200 |
| commit | 0ab8cf5b312f36a14f66d4564c6f4b1694ddaae0 (patch) | |
| tree | 105228f3c2e2d77a02566a9344712e3c7e6cebaf /src/wx | |
| parent | 8f8730cadb3dae36e8aa7b7c732a7c162eac0fb6 (diff) | |
Rename some variables and re-implement collect().
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/kdm_dialog.cc | 6 | ||||
| -rw-r--r-- | src/wx/kdm_output_panel.cc | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc index 14ba5cf05..0686450fb 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<KDMWithMetadataPtr> screen_kdms; + list<KDMWithMetadataPtr> kdms; try { /* Start off by enabling forensic marking for all */ optional<int> for_audio; @@ -180,7 +180,7 @@ KDMDialog::make_clicked () } name_values['s'] = i->name; - screen_kdms.push_back (KDMWithMetadataPtr(new DCPKDMWithMetadata(name_values, i->cinema, kdm))); + kdms.push_back (KDMWithMetadataPtr(new DCPKDMWithMetadata(name_values, i->cinema, kdm))); } } @@ -196,7 +196,7 @@ KDMDialog::make_clicked () return; } - pair<shared_ptr<Job>, int> result = _output->make (screen_kdms, film->name(), _timing, bind (&KDMDialog::confirm_overwrite, this, _1)); + pair<shared_ptr<Job>, int> result = _output->make (kdms, film->name(), _timing, bind (&KDMDialog::confirm_overwrite, this, _1)); if (result.first) { JobManager::instance()->add (result.first); } diff --git a/src/wx/kdm_output_panel.cc b/src/wx/kdm_output_panel.cc index dcd5c6f91..025707b28 100644 --- a/src/wx/kdm_output_panel.cc +++ b/src/wx/kdm_output_panel.cc @@ -182,10 +182,10 @@ KDMOutputPanel::kdm_write_type_changed () pair<shared_ptr<Job>, int> KDMOutputPanel::make ( - list<KDMWithMetadataPtr> screen_kdms, string name, KDMTimingPanel* timing, function<bool (boost::filesystem::path)> confirm_overwrite + list<KDMWithMetadataPtr> kdms, string name, KDMTimingPanel* timing, function<bool (boost::filesystem::path)> confirm_overwrite ) { - list<list<KDMWithMetadataPtr> > const cinema_kdms = collect (screen_kdms); + list<list<KDMWithMetadataPtr> > const cinema_kdms = collect (kdms); /* Decide whether to proceed */ @@ -247,7 +247,7 @@ KDMOutputPanel::make ( if (_write_to->GetValue()) { if (_write_flat->GetValue()) { written = write_files ( - screen_kdms, + kdms, directory(), _filename_format->get(), name_values, @@ -255,7 +255,7 @@ KDMOutputPanel::make ( ); } else if (_write_folder->GetValue()) { written = write_directories ( - collect (screen_kdms), + collect (kdms), directory(), _container_name_format->get(), _filename_format->get(), @@ -264,7 +264,7 @@ KDMOutputPanel::make ( ); } else if (_write_zip->GetValue()) { written = write_zip_files ( - collect (screen_kdms), + collect (kdms), directory(), _container_name_format->get(), _filename_format->get(), |