#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;
<< " -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 SimpleUISignaller : public UISignaller
+{
+public:
+ /* Do nothing in this method so that UI events happen in our thread
+ when we call UISignaller::ui_idle().
+ */
+ void wake_ui () {}
+};
+
int
main (int argc, char* argv[])
{
DCPContentType const * dcp_content_type = DCPContentType::from_dci_name ("TST");
Ratio const * container_ratio = 0;
Ratio const * content_ratio = 0;
+ int still_length = 10;
boost::filesystem::path output;
int option_index = 0;
{ "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;
}
exit (EXIT_FAILURE);
}
break;
+ case 's':
+ still_length = atoi (optarg);
+ break;
case 'o':
output = optarg;
break;
}
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);
}
container_ratio = content_ratio;
}
- ui_signaller = new UISignaller ();
+ if (optind == argc) {
+ cerr << argv[0] << ": no content specified.\n";
+ exit (EXIT_FAILURE);
+ }
+
+ ui_signaller = new SimpleUISignaller ();
try {
shared_ptr<Film> film (new Film (output, false));
}
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);
if (vc) {
- vc->set_ratio (content_ratio);
+ vc->set_scale (VideoContentScale (content_ratio));
}
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 (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 (ContentTime::from_seconds (still_length));
+ }
}
-
+
if (jm->errors ()) {
list<shared_ptr<Job> > jobs = jm->get ();
for (list<shared_ptr<Job> >::iterator i = jobs.begin(); i != jobs.end(); ++i) {
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";