Hand-apply 6a3cd511559433554ab40ed72ff94b7d8dc2c5bd from master;

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

diff --git a/src/tools/dcpomatic_create.cc b/src/tools/dcpomatic_create.cc
index c30f4e51e7fc66c7963f3aaa2f65b3c7b9c1296d..6e8f1688843f48bb160c244c4b23db76ddccb704 100644 (file)
--- a/src/tools/dcpomatic_create.cc
+++ b/src/tools/dcpomatic_create.cc
@@ -81,7 +81,7 @@ main (int argc, char* argv[])
        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'},
@@ -178,7 +178,7 @@ main (int argc, char* argv[])
                        if (vc) {
                                vc->set_scale (VideoContentScale (content_ratio));
                        }
-                       film->examine_and_add_content (c);
+                       film->examine_and_add_content (c, true);
                }
                
                JobManager* jm = JobManager::instance ();
@@ -190,7 +190,7 @@ main (int argc, char* argv[])
                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));
                        }
                }