Allow content factory to return multiple content.

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

diff --git a/src/tools/dcpomatic_create.cc b/src/tools/dcpomatic_create.cc
index fd950807c3eed51480ed75ecdccea160c0e935a6..0582f5cac0d5701ac2912faccf675355ecd9ff84 100644 (file)
--- a/src/tools/dcpomatic_create.cc
+++ b/src/tools/dcpomatic_create.cc
@@ -29,8 +29,10 @@
 #include "lib/ratio.h"
 #include "lib/image_content.h"
 #include "lib/video_content.h"
+#include "lib/cross.h"
 #include <libxml++/libxml++.h>
 #include <boost/filesystem.hpp>
+#include <boost/foreach.hpp>
 #include <getopt.h>
 #include <string>
 #include <iostream>
@@ -44,6 +46,7 @@ using std::list;
 using std::exception;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
+using boost::optional;
 
 static void
 syntax (string n)
@@ -52,6 +55,7 @@ syntax (string n)
             << "  -v, --version                 show DCP-o-matic version\n"
             << "  -h, --help                    show this help\n"
             << "  -n, --name <name>             film name\n"
+            << "  -t, --template <name>         template name\n"
             << "  -c, --dcp-content-type <type> FTR, SHR, TLR, TST, XSN, RTG, TSR, POL, PSA or ADV\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"
@@ -88,6 +92,7 @@ main (int argc, char* argv[])
        dcpomatic_setup ();
 
        string name;
+       optional<string> template_name;
        DCPContentType const * dcp_content_type = DCPContentType::from_isdcf_name ("TST");
        Ratio const * container_ratio = 0;
        Ratio const * content_ratio = 0;
@@ -103,6 +108,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'},
                        { "dcp-content-type", required_argument, 0, 'c'},
                        { "container-ratio", required_argument, 0, 'A'},
                        { "content-ratio", required_argument, 0, 'B'},
@@ -114,7 +120,7 @@ main (int argc, char* argv[])
                        { 0, 0, 0, 0}
                };
 
-               int c = getopt_long (argc, argv, "vhn:c:A:B:C:s:o:DE", long_options, &option_index);
+               int c = getopt_long (argc, argv, "vhn:f:c:A:B:C:s:o:DE", long_options, &option_index);
                if (c == -1) {
                        break;
                }
@@ -129,6 +135,9 @@ main (int argc, char* argv[])
                case 'n':
                        name = optarg;
                        break;
+               case 't':
+                       template_name = optarg;
+                       break;
                case 'c':
                        dcp_content_type = DCPContentType::from_isdcf_name (optarg);
                        if (dcp_content_type == 0) {
@@ -206,7 +215,10 @@ main (int argc, char* argv[])
        }
 
        try {
-               shared_ptr<Film> film (new Film (output, false));
+               shared_ptr<Film> film (new Film (output));
+               if (template_name) {
+                       film->use_template (template_name.get());
+               }
                film->set_name (name);
 
                film->set_container (container_ratio);
@@ -216,16 +228,20 @@ main (int argc, char* argv[])
                film->set_signed (sign);
 
                for (int i = optind; i < argc; ++i) {
-                       shared_ptr<Content> c = content_factory (film, boost::filesystem::canonical (argv[i]));
-                       if (c->video) {
-                               c->video->set_scale (VideoContentScale (content_ratio));
+                       BOOST_FOREACH (shared_ptr<Content> j, content_factory (film, boost::filesystem::canonical (argv[i]))) {
+                               if (j->video) {
+                                       j->video->set_scale (VideoContentScale (content_ratio));
+                               }
+                               film->examine_and_add_content (j);
                        }
-                       film->examine_and_add_content (c);
                }
 
                JobManager* jm = JobManager::instance ();
 
-               while (jm->work_to_do ()) {}
+               while (jm->work_to_do ()) {
+                       dcpomatic_sleep (1);
+               }
+
                while (signal_manager->ui_idle() > 0) {}
 
                ContentList content = film->content ();