X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_create.cc;h=d4d4df29b814f109066c0d87dc1ad3ae910a0288;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=3dfbd63b57a1c9db685f6eb48415e18b66078889;hpb=3753cb8685e1755b067676345a5871db24149d0f;p=dcpomatic.git

diff --git a/src/tools/dcpomatic_create.cc b/src/tools/dcpomatic_create.cc
index 3dfbd63b5..d4d4df29b 100644
--- a/src/tools/dcpomatic_create.cc
+++ b/src/tools/dcpomatic_create.cc
@@ -28,10 +28,11 @@
 #include "lib/util.h"
 #include "lib/content_factory.h"
 #include "lib/job_manager.h"
-#include "lib/ui_signaller.h"
+#include "lib/signal_manager.h"
 #include "lib/job.h"
 #include "lib/dcp_content_type.h"
 #include "lib/ratio.h"
+#include "lib/image_content.h"
 
 using std::string;
 using std::cout;
@@ -52,24 +53,35 @@ help (string n)
 	     << "  -h, --help                    show this help\n"
 	     << "  -n, --name <name>             film name\n"
 	     << "  -c, --dcp-content-type <type> FTR, SHR, TLR, TST, XSN, RTG, TSR, POL, PSA or ADV\n"
-	     << "      --container-ratio         119, 133, 137, 138, 166, 178, 185 or 239\n"
-	     << "      --content-ratio           119, 133, 137, 138, 166, 178, 185 or 239\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"
+	     << "  -s, --still-length <n>        number of seconds that still content should last\n"
 	     << "  -o, --output <dir>            output directory\n";
 }
 
+class SimpleSignalManager : public SignalManager
+{
+public:
+	/* Do nothing in this method so that UI events happen in our thread
+	   when we call SignalManager::ui_idle().
+	*/
+	void wake_ui () {}
+};
+
 int
 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'},
@@ -77,11 +89,12 @@ main (int argc, char* argv[])
 			{ "dcp-content-type", required_argument, 0, 'c'},
 			{ "container-ratio", required_argument, 0, 'A'},
 			{ "content-ratio", required_argument, 0, 'B'},
+			{ "still-length", required_argument, 0, 's'},
 			{ "output", required_argument, 0, 'o'},
 			{ 0, 0, 0, 0}
 		};
 
-		int c = getopt_long (argc, argv, "vhn:c:A:B:o:", long_options, &option_index);
+		int c = getopt_long (argc, argv, "vhn:c:A:B:s:o:", long_options, &option_index);
 		if (c == -1) {
 			break;
 		}
@@ -97,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]);
@@ -120,6 +133,9 @@ main (int argc, char* argv[])
 				exit (EXIT_FAILURE);
 			}
 			break;
+		case 's':
+			still_length = atoi (optarg);
+			break;
 		case 'o':
 			output = optarg;
 			break;
@@ -132,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);
 	}
 
@@ -141,7 +156,12 @@ main (int argc, char* argv[])
 		container_ratio = content_ratio;
 	}
 
-	ui_signaller = new UISignaller ();
+	if (optind == argc) {
+		cerr << argv[0] << ": no content specified.\n";
+		exit (EXIT_FAILURE);
+	}
+
+	signal_manager = new SimpleSignalManager ();
 
 	try {
 		shared_ptr<Film> film (new Film (output, false));
@@ -150,7 +170,8 @@ main (int argc, char* argv[])
 		}
 
 		film->set_container (container_ratio);
-		
+		film->set_dcp_content_type (dcp_content_type);
+
 		for (int i = optind; i < argc; ++i) {
 			shared_ptr<Content> c = content_factory (film, argv[i]);
 			shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (c);
@@ -159,12 +180,20 @@ main (int argc, char* argv[])
 			}
 			film->examine_and_add_content (c);
 		}
-		
+
 		JobManager* jm = JobManager::instance ();
-		while (jm->work_to_do ()) {
-			ui_signaller->ui_idle ();
+
+		while (jm->work_to_do ()) {}
+		while (signal_manager->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);
+			}
 		}
-		
+
 		if (jm->errors ()) {
 			list<shared_ptr<Job> > jobs = jm->get ();
 			for (list<shared_ptr<Job> >::iterator i = jobs.begin(); i != jobs.end(); ++i) {
@@ -179,12 +208,12 @@ main (int argc, char* argv[])
 		if (!output.empty ()) {
 			film->write_metadata ();
 		} else {
-			film->metadata()->write_to_stream_formatted (cout);
+			film->metadata()->write_to_stream_formatted (cout, "UTF-8");
 		}
 	} catch (exception& e) {
 		cerr << argv[0] << ": " << e.what() << "\n";
 		exit (EXIT_FAILURE);
 	}
-		
+
 	return 0;
 }