Rename some variables and re-implement collect().

[dcpomatic.git] / src / wx / kdm_output_panel.cc

diff --git a/src/wx/kdm_output_panel.cc b/src/wx/kdm_output_panel.cc
index dcd5c6f91171e1dec299db5aef8f337cb2b8f36e..025707b287213ea813742d1609166babb2d25f3b 100644 (file)
--- 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(),