Merge master.

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

diff --git a/src/tools/dcpomatic_create.cc b/src/tools/dcpomatic_create.cc
index 1a4ea0717049c98ee4e4c80ed9bb60e253eb12f4..304f4f697ab6e8a031c44dd2a74c3b896f2c448a 100644 (file)
--- a/src/tools/dcpomatic_create.cc
+++ b/src/tools/dcpomatic_create.cc
@@ -74,14 +74,14 @@ main (int argc, char* argv[])
        dcpomatic_setup ();
 
        string name;
-       DCPContentType const * dcp_content_type = DCPContentType::from_dci_name ("TST");
+       DCPContentType const * dcp_content_type = DCPContentType::from_isdcf_name ("TST");
        Ratio const * container_ratio = 0;
        Ratio const * content_ratio = 0;
        int still_length = 10;
        boost::filesystem::path output;
        
        int option_index = 0;
-       while (1) {
+       while (true) {
                static struct option long_options[] = {
                        { "version", no_argument, 0, 'v'},
                        { "help", no_argument, 0, 'h'},
@@ -110,7 +110,7 @@ main (int argc, char* argv[])
                        name = optarg;
                        break;
                case 'c':
-                       dcp_content_type = DCPContentType::from_dci_name (optarg);
+                       dcp_content_type = DCPContentType::from_isdcf_name (optarg);
                        if (dcp_content_type == 0) {
                                cerr << "Bad DCP content type.\n";
                                help (argv[0]);
@@ -148,8 +148,7 @@ main (int argc, char* argv[])
        }
 
        if (!content_ratio) {
-               cerr << "Missing required option --content-ratio.\n";
-               help (argv[0]);
+               cerr << argv[0] << ": missing required option --content-ratio.\n";
                exit (EXIT_FAILURE);
        }
 
@@ -157,6 +156,11 @@ main (int argc, char* argv[])
                container_ratio = content_ratio;
        }
 
+       if (optind == argc) {
+               cerr << argv[0] << ": no content specified.\n";
+               exit (EXIT_FAILURE);
+       }
+
        ui_signaller = new SimpleUISignaller ();
 
        try {
@@ -178,15 +182,15 @@ main (int argc, char* argv[])
                }
                
                JobManager* jm = JobManager::instance ();
-               while (jm->work_to_do ()) {
-                       ui_signaller->ui_idle ();
-               }
+
+               while (jm->work_to_do ()) {}
+               while (ui_signaller->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 (still_length * 24);
+                               ic->set_video_length (ContentTime::from_seconds (still_length));
                        }
                }