Fix -t 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 7c3ee1308dd02ae6e9a339dd64517978ff55b1a3..aea25618c41d06a1a799d80e971ab89ebbe5a3c1 100644 (file)
--- a/src/tools/dcpomatic_create.cc
+++ b/src/tools/dcpomatic_create.cc
@@ -30,6 +30,7 @@
 #include "lib/image_content.h"
 #include "lib/video_content.h"
 #include "lib/cross.h"
+#include "lib/config.h"
 #include "lib/dcp_content.h"
 #include <dcp/exceptions.h>
 #include <libxml++/libxml++.h>
@@ -66,6 +67,7 @@ syntax (string n)
             << "      --standard <standard>     SMPTE or interop (default SMPTE)\n"
             << "      --no-use-isdcf-name       do not use an ISDCF name; use the specified name unmodified\n"
             << "      --no-sign                 do not sign the DCP\n"
+            << "      --config <dir>            directory containing config.xml and cinemas.xml\n"
             << "  -o, --output <dir>            output directory\n";
 }
 
@@ -105,6 +107,7 @@ main (int argc, char* argv[])
        optional<boost::filesystem::path> output;
        bool sign = true;
        bool use_isdcf_name = true;
+       optional<boost::filesystem::path> config;
 
        int option_index = 0;
        while (true) {
@@ -112,7 +115,7 @@ main (int argc, char* argv[])
                        { "version", no_argument, 0, 'v'},
                        { "help", no_argument, 0, 'h'},
                        { "name", required_argument, 0, 'n'},
-                       { "template", required_argument, 0, 'f'},
+                       { "template", required_argument, 0, 't'},
                        { "dcp-content-type", required_argument, 0, 'c'},
                        { "dcp-frame-rate", required_argument, 0, 'f'},
                        { "container-ratio", required_argument, 0, 'A'},
@@ -122,10 +125,11 @@ main (int argc, char* argv[])
                        { "no-use-isdcf-name", no_argument, 0, 'D'},
                        { "no-sign", no_argument, 0, 'E'},
                        { "output", required_argument, 0, 'o'},
+                       { "config", required_argument, 0, 'F'},
                        { 0, 0, 0, 0}
                };
 
-               int c = getopt_long (argc, argv, "vhn:f:c:f:A:B:C:s:o:DE", long_options, &option_index);
+               int c = getopt_long (argc, argv, "vhn:t:c:f:A:B:C:s:o:DEF:", long_options, &option_index);
                if (c == -1) {
                        break;
                }
@@ -185,6 +189,9 @@ main (int argc, char* argv[])
                case 'E':
                        sign = false;
                        break;
+               case 'F':
+                       config = optarg;
+                       break;
                case 's':
                        still_length = atoi (optarg);
                        break;
@@ -202,6 +209,10 @@ main (int argc, char* argv[])
                exit (EXIT_FAILURE);
        }
 
+       if (config) {
+               Config::override_path = *config;
+       }
+
        if (!content_ratio) {
                cerr << argv[0] << ": missing required option --content-ratio.\n";
                exit (EXIT_FAILURE);
@@ -238,14 +249,12 @@ main (int argc, char* argv[])
                for (int i = optind; i < argc; ++i) {
                        boost::filesystem::path const can = boost::filesystem::canonical (argv[i]);
                        list<shared_ptr<Content> > content;
-                       try {
-                               content.push_back (shared_ptr<DCPContent> (new DCPContent (film, can)));
-                       } catch (dcp::DCPReadError) {
-                               /* I guess it's not a DCP */
-                               content = content_factory (film, can);
-                       } catch (boost::filesystem::filesystem_error) {
+
+                       if (boost::filesystem::exists (can / "ASSETMAP") || (boost::filesystem::exists (can / "ASSETMAP.xml"))) {
+                               content.push_back (shared_ptr<DCPContent>(new DCPContent(can)));
+                       } else {
                                /* I guess it's not a DCP */
-                               content = content_factory (film, can);
+                               content = content_factory (can);
                        }
 
                        BOOST_FOREACH (shared_ptr<Content> j, content) {
@@ -271,7 +280,7 @@ main (int argc, char* argv[])
                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) {
+                       if (ic && ic->still()) {
                                ic->video->set_length (still_length * 24);
                        }
                }