Add --standard option to dcpomatic_create

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

diff --git a/src/tools/dcpomatic_create.cc b/src/tools/dcpomatic_create.cc
index 304f4f697ab6e8a031c44dd2a74c3b896f2c448a..3d07933e28d68c55443911c5741126e606de0a72 100644 (file)
--- a/src/tools/dcpomatic_create.cc
+++ b/src/tools/dcpomatic_create.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@
 #include "lib/util.h"
 #include "lib/content_factory.h"
 #include "lib/job_manager.h"
-#include "lib/ui_signaller.h"
+#include "lib/signal_manager.h"
 #include "lib/job.h"
 #include "lib/dcp_content_type.h"
 #include "lib/ratio.h"
@@ -43,12 +43,9 @@ using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 
 static void
-help (string n)
+syntax (string n)
 {
-       cerr << "Create a film directory (ready for making a DCP) or metadata file from some content files.\n"
-            << "A film directory will be created if -o or --output is specified, otherwise a metadata file\n"
-            << "will be written to stdout.\n"
-            << "Syntax: " << n << " [OPTION] <CONTENT> [<CONTENT> ...]\n"
+       cerr << "Syntax: " << n << " [OPTION] <CONTENT> [<CONTENT> ...]\n"
             << "  -v, --version                 show DCP-o-matic version\n"
             << "  -h, --help                    show this help\n"
             << "  -n, --name <name>             film name\n"
@@ -56,14 +53,23 @@ help (string n)
             << "      --container-ratio <ratio> 119, 133, 137, 138, 166, 178, 185 or 239\n"
             << "      --content-ratio <ratio>   119, 133, 137, 138, 166, 178, 185 or 239\n"
             << "  -s, --still-length <n>        number of seconds that still content should last\n"
+            << "      --standard <standard>     SMPTE or interop (default SMPTE)\n"
             << "  -o, --output <dir>            output directory\n";
 }
 
-class SimpleUISignaller : public UISignaller
+static void
+help (string n)
+{
+       cerr << "Create a film directory (ready for making a DCP) or metadata file from some content files.\n"
+            << "A film directory will be created if -o or --output is specified, otherwise a metadata file\n"
+            << "will be written to stdout.\n";
+}
+
+class SimpleSignalManager : public SignalManager
 {
 public:
        /* Do nothing in this method so that UI events happen in our thread
-          when we call UISignaller::ui_idle().
+          when we call SignalManager::ui_idle().
        */
        void wake_ui () {}
 };
@@ -78,8 +84,9 @@ main (int argc, char* argv[])
        Ratio const * container_ratio = 0;
        Ratio const * content_ratio = 0;
        int still_length = 10;
+       dcp::Standard standard = dcp::SMPTE;
        boost::filesystem::path output;
-       
+
        int option_index = 0;
        while (true) {
                static struct option long_options[] = {
@@ -90,11 +97,12 @@ main (int argc, char* argv[])
                        { "container-ratio", required_argument, 0, 'A'},
                        { "content-ratio", required_argument, 0, 'B'},
                        { "still-length", required_argument, 0, 's'},
+                       { "standard", required_argument, 0, 'C'},
                        { "output", required_argument, 0, 'o'},
                        { 0, 0, 0, 0}
                };
 
-               int c = getopt_long (argc, argv, "vhn:c:A:B:s:o:", long_options, &option_index);
+               int c = getopt_long (argc, argv, "vhn:c:A:B:C:s:o:", long_options, &option_index);
                if (c == -1) {
                        break;
                }
@@ -113,7 +121,7 @@ main (int argc, char* argv[])
                        dcp_content_type = DCPContentType::from_isdcf_name (optarg);
                        if (dcp_content_type == 0) {
                                cerr << "Bad DCP content type.\n";
-                               help (argv[0]);
+                               syntax (argv[0]);
                                exit (EXIT_FAILURE);
                        }
                        break;
@@ -121,7 +129,7 @@ main (int argc, char* argv[])
                        container_ratio = Ratio::from_id (optarg);
                        if (container_ratio == 0) {
                                cerr << "Bad container ratio.\n";
-                               help (argv[0]);
+                               syntax (argv[0]);
                                exit (EXIT_FAILURE);
                        }
                        break;
@@ -129,7 +137,16 @@ main (int argc, char* argv[])
                        content_ratio = Ratio::from_id (optarg);
                        if (content_ratio == 0) {
                                cerr << "Bad content ratio " << optarg << ".\n";
-                               help (argv[0]);
+                               syntax (argv[0]);
+                               exit (EXIT_FAILURE);
+                       }
+                       break;
+               case 'C':
+                       if (strcmp (optarg, "interop") == 0) {
+                               standard = dcp::INTEROP;
+                       } else if (strcmp (optarg, "SMPTE") != 0) {
+                               cerr << "Bad standard " << optarg << ".\n";
+                               syntax (argv[0]);
                                exit (EXIT_FAILURE);
                        }
                        break;
@@ -161,7 +178,7 @@ main (int argc, char* argv[])
                exit (EXIT_FAILURE);
        }
 
-       ui_signaller = new SimpleUISignaller ();
+       signal_manager = new SimpleSignalManager ();
 
        try {
                shared_ptr<Film> film (new Film (output, false));
@@ -171,7 +188,8 @@ main (int argc, char* argv[])
 
                film->set_container (container_ratio);
                film->set_dcp_content_type (dcp_content_type);
-               
+               film->set_interop (standard == dcp::INTEROP);
+
                for (int i = optind; i < argc; ++i) {
                        shared_ptr<Content> c = content_factory (film, argv[i]);
                        shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (c);
@@ -180,17 +198,17 @@ main (int argc, char* argv[])
                        }
                        film->examine_and_add_content (c);
                }
-               
+
                JobManager* jm = JobManager::instance ();
 
                while (jm->work_to_do ()) {}
-               while (ui_signaller->ui_idle() > 0) {}
+               while (signal_manager->ui_idle() > 0) {}
 
                ContentList content = film->content ();
                for (ContentList::iterator i = content.begin(); i != content.end(); ++i) {
                        shared_ptr<ImageContent> ic = dynamic_pointer_cast<ImageContent> (*i);
                        if (ic) {
-                               ic->set_video_length (ContentTime::from_seconds (still_length));
+                               ic->set_video_length (still_length * 24);
                        }
                }
 
@@ -214,6 +232,6 @@ main (int argc, char* argv[])
                cerr << argv[0] << ": " << e.what() << "\n";
                exit (EXIT_FAILURE);
        }
-               
+
        return 0;
 }