X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_create.cc;h=6e8f1688843f48bb160c244c4b23db76ddccb704;hb=f6481c5613e8a03fc3a3361afe406e75171bd960;hp=36e04120e306732ea54bba4ce68acd16d0af5300;hpb=8d012bf6205f54ecb59634376f0e53dd340e34f1;p=dcpomatic.git

diff --git a/src/tools/dcpomatic_create.cc b/src/tools/dcpomatic_create.cc
index 36e04120e..6e8f16888 100644
--- 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]);
@@ -178,19 +178,19 @@ 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 ();
-		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));
 			}
 		}