Accessor for ClosedCaptionsDialog.

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

diff --git a/src/tools/dcpomatic_kdm_cli.cc b/src/tools/dcpomatic_kdm_cli.cc
index 84eb989eee1cfeec7821197cd30848dca48de9fb..166b22285a741f8cd5cdc491982042c78d3f8f8a 100644 (file)
--- a/src/tools/dcpomatic_kdm_cli.cc
+++ b/src/tools/dcpomatic_kdm_cli.cc
@@ -47,6 +47,7 @@ using boost::shared_ptr;
 using boost::optional;
 using boost::bind;
 using boost::dynamic_pointer_cast;
+using namespace dcpomatic;
 
 static void
 help ()
@@ -60,8 +61,8 @@ help ()
                "  -t, --valid-to                           valid to time (in local time zone of the cinema) (e.g. \"2014-09-28 01:41:51\")\n"
                "  -d, --valid-duration                     valid duration (e.g. \"1 day\", \"4 hours\", \"2 weeks\")\n"
                "  -F, --formulation                        modified-transitional-1, multiple-modified-transitional-1, dci-any or dci-specific [default modified-transitional-1]\n"
-               "  -a, --disable-forensic-marking-picture   disable forensic of pictures essences\n"
-               "  -a, --disable-forensic-marking-audio     disable forensic of audio essences (optionally above a given channel, e.g 12)\n"
+               "  -a, --disable-forensic-marking-picture   disable forensic marking of pictures essences\n"
+               "  -a, --disable-forensic-marking-audio     disable forensic marking of audio essences (optionally above a given channel, e.g 12)\n"
                "  -z, --zip                                ZIP each cinema's KDMs into its own file\n"
                "  -v, --verbose                            be verbose\n"
                "  -c, --cinema                             specify a cinema, either by name or email address\n"
@@ -129,7 +130,7 @@ always_overwrite ()
 
 void
 write_files (
-       list<ScreenKDM> screen_kdms,
+       list<shared_ptr<ScreenKDM> > screen_kdms,
        bool zip,
        boost::filesystem::path output,
        dcp::NameFormat container_name_format,
@@ -228,7 +229,7 @@ from_film (
        values['e'] = dcp::LocalTime(valid_to).date() + " " + dcp::LocalTime(valid_to).time_of_day(true, false);
 
        try {
-               list<ScreenKDM> screen_kdms = film->make_kdms (
+               list<shared_ptr<ScreenKDM> > screen_kdms = film->make_kdms (
                        screens, cpl, valid_from, valid_to, formulation, disable_forensic_marking_picture, disable_forensic_marking_audio
                        );
 
@@ -329,24 +330,26 @@ from_dkdm (
        values['e'] = dcp::LocalTime(valid_to).date() + " " + dcp::LocalTime(valid_to).time_of_day(true, false);
 
        try {
-               list<ScreenKDM> screen_kdms;
+               list<shared_ptr<ScreenKDM> > screen_kdms;
                BOOST_FOREACH (shared_ptr<Screen> i, screens) {
                        if (!i->recipient) {
                                continue;
                        }
 
                        screen_kdms.push_back (
-                               ScreenKDM (
-                                       i,
-                                       kdm_from_dkdm (
-                                               dkdm,
-                                               i->recipient.get(),
-                                               i->trusted_device_thumbprints(),
-                                               dcp::LocalTime(valid_from, i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()),
-                                               dcp::LocalTime(valid_to, i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()),
-                                               formulation,
-                                               disable_forensic_marking_picture,
-                                               disable_forensic_marking_audio
+                               shared_ptr<ScreenKDM>(
+                                       new DCPScreenKDM(
+                                               i,
+                                               kdm_from_dkdm(
+                                                       dkdm,
+                                                       i->recipient.get(),
+                                                       i->trusted_device_thumbprints(),
+                                                       dcp::LocalTime(valid_from, i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()),
+                                                       dcp::LocalTime(valid_to, i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()),
+                                                       formulation,
+                                                       disable_forensic_marking_picture,
+                                                       disable_forensic_marking_audio
+                                                       )
                                                )
                                        )
                                );
@@ -505,7 +508,7 @@ int main (int argc, char* argv[])
                {
                        /* Make a new screen and add it to the current cinema */
                        dcp::CertificateChain chain (dcp::file_to_string(optarg));
-                       shared_ptr<Screen> screen (new Screen (screen_description, chain.leaf(), vector<TrustedDevice>()));
+                       shared_ptr<Screen> screen (new Screen (screen_description, "", chain.leaf(), vector<TrustedDevice>()));
                        if (cinema) {
                                cinema->add_screen (screen);
                        }