Put some get/sets in FFmpegAudioStream.

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

diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index 2ad07cce7a38bae73c62f2b1824def725e9ada34..f9ed155445b5f1852c154b807195602c3d4567b6 100644 (file)
--- a/src/tools/dcpomatic_kdm.cc
+++ b/src/tools/dcpomatic_kdm.cc
@@ -177,7 +177,7 @@ int main (int argc, char* argv[])
                        } else if (string (optarg) == "dci-specific") {
                                formulation = dcp::DCI_SPECIFIC;
                        } else {
-                               error ("unrecognised KDM formulation " + formulation);
+                               error ("unrecognised KDM formulation " + string (optarg));
                        }
                }
        }
@@ -248,7 +248,7 @@ int main (int argc, char* argv[])
                        error ("you must specify --output");
                }
                
-               shared_ptr<dcp::Certificate> certificate (new dcp::Certificate (boost::filesystem::path (certificate_file)));
+               dcp::Certificate certificate (dcp::file_to_string (certificate_file));
                dcp::EncryptedKDM kdm = film->make_kdm (certificate, cpl, valid_from.get(), valid_to.get(), formulation);
                kdm.as_xml (output);
                if (verbose) {