#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"
<< " -o, --output <dir> output directory\n";
}
-class SimpleUISignaller : public UISignaller
+class SimpleSignalManager : public SignalManager
{
public:
/* Do nothing in this method so that UI events happen in our thread
- when we call UISignaller::ui_idle().
+ when we call SignalManager::ui_idle().
*/
void wake_ui () {}
};
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'},
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]);
exit (EXIT_FAILURE);
}
- ui_signaller = new SimpleUISignaller ();
+ signal_manager = new SimpleSignalManager ();
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);
}
film->examine_and_add_content (c);
}
-
+
JobManager* jm = JobManager::instance ();
while (jm->work_to_do ()) {}
- while (ui_signaller->ui_idle() > 0) {}
+ 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 (ContentTime::from_seconds (still_length));
+ ic->set_video_length (still_length * 24);
}
}
cerr << argv[0] << ": " << e.what() << "\n";
exit (EXIT_FAILURE);
}
-
+
return 0;
}