X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_create.cc;h=d4d4df29b814f109066c0d87dc1ad3ae910a0288;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=304f4f697ab6e8a031c44dd2a74c3b896f2c448a;hpb=e491397c0028a80ac4a48a92007f783746553c1a;p=dcpomatic.git
diff --git a/src/tools/dcpomatic_create.cc b/src/tools/dcpomatic_create.cc
index 304f4f697..d4d4df29b 100644
--- a/src/tools/dcpomatic_create.cc
+++ b/src/tools/dcpomatic_create.cc
@@ -28,7 +28,7 @@
#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"
@@ -59,11 +59,11 @@ help (string n)
<< " -o, --output
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 () {}
};
@@ -79,7 +79,7 @@ main (int argc, char* argv[])
Ratio const * content_ratio = 0;
int still_length = 10;
boost::filesystem::path output;
-
+
int option_index = 0;
while (true) {
static struct option long_options[] = {
@@ -161,7 +161,7 @@ main (int argc, char* argv[])
exit (EXIT_FAILURE);
}
- ui_signaller = new SimpleUISignaller ();
+ signal_manager = new SimpleSignalManager ();
try {
shared_ptr film (new Film (output, false));
@@ -171,7 +171,7 @@ 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 c = content_factory (film, argv[i]);
shared_ptr vc = dynamic_pointer_cast (c);
@@ -180,17 +180,17 @@ main (int argc, char* argv[])
}
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 ic = dynamic_pointer_cast (*i);
if (ic) {
- ic->set_video_length (ContentTime::from_seconds (still_length));
+ ic->set_video_length (still_length * 24);
}
}
@@ -214,6 +214,6 @@ main (int argc, char* argv[])
cerr << argv[0] << ": " << e.what() << "\n";
exit (EXIT_FAILURE);
}
-
+
return 0;
}