Rename some variables and re-implement collect().

[dcpomatic.git] / src / tools / dcpomatic_kdm.cc

diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index bbaf5bad717d03b6b6eb12c3855251113fe23210..dd45401cb70c050c79c602c1d7a1e0a182daa680 100644 (file)
--- a/src/tools/dcpomatic_kdm.cc
+++ b/src/tools/dcpomatic_kdm.cc
@@ -302,7 +302,7 @@ private:
                                return;
                        }
 
-                       list<KDMWithMetadataPtr> screen_kdms;
+                       list<KDMWithMetadataPtr> kdms;
                        string title;
 
 #ifdef DCPOMATIC_VARIANT_SWAROOP
@@ -330,7 +330,7 @@ private:
                                        name_values['s'] = i->name;
 
                                        /* Encrypt */
-                                       screen_kdms.push_back (
+                                       kdms.push_back (
                                                KDMWithMetadataPtr(
                                                        new ECinemaKDMWithMetadata(name_values, i->cinema, kdm.encrypt(i->recipient.get()))
                                                        )
@@ -377,7 +377,7 @@ private:
                                        name_values['s'] = i->name;
 
                                        /* Encrypt */
-                                       screen_kdms.push_back (
+                                       kdms.push_back (
                                                KDMWithMetadataPtr(
                                                        new DCPKDMWithMetadata(
                                                                name_values,
@@ -392,12 +392,12 @@ private:
                                }
                        }
 
-                       if (screen_kdms.empty()) {
+                       if (kdms.empty()) {
                                return;
                        }
 
                        pair<shared_ptr<Job>, int> result = _output->make (
-                               screen_kdms, title, _timing, bind (&DOMFrame::confirm_overwrite, this, _1)
+                               kdms, title, _timing, bind (&DOMFrame::confirm_overwrite, this, _1)
                                );
 
                        if (result.first) {