projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
19940a8e1ff462e567fbf79ccf5ce81a57444f8b from master; make dcpomatic_cli less talkati...
[dcpomatic.git]
/
src
/
tools
/
dcpomatic_create.cc
diff --git
a/src/tools/dcpomatic_create.cc
b/src/tools/dcpomatic_create.cc
index b0a67c6d93d5630fc919731ff251114c292f2690..d121eb0ccf4caea4030a13e3ac12aa8b574c0e36 100644
(file)
--- 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/util.h"
#include "lib/content_factory.h"
#include "lib/job_manager.h"
-#include "lib/
ui_signall
er.h"
+#include "lib/
signal_manag
er.h"
#include "lib/job.h"
#include "lib/dcp_content_type.h"
#include "lib/ratio.h"
#include "lib/job.h"
#include "lib/dcp_content_type.h"
#include "lib/ratio.h"
@@
-59,11
+59,11
@@
help (string n)
<< " -o, --output <dir> output directory\n";
}
<< " -o, --output <dir> output directory\n";
}
-class Simple
UISignaller : public UISignall
er
+class Simple
SignalManager : public SignalManag
er
{
public:
/* Do nothing in this method so that UI events happen in our thread
{
public:
/* Do nothing in this method so that UI events happen in our thread
- when we call
UISignall
er::ui_idle().
+ when we call
SignalManag
er::ui_idle().
*/
void wake_ui () {}
};
*/
void wake_ui () {}
};
@@
-81,7
+81,7
@@
main (int argc, char* argv[])
boost::filesystem::path output;
int option_index = 0;
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'},
static struct option long_options[] = {
{ "version", no_argument, 0, 'v'},
{ "help", no_argument, 0, 'h'},
@@
-161,7
+161,7
@@
main (int argc, char* argv[])
exit (EXIT_FAILURE);
}
exit (EXIT_FAILURE);
}
-
ui_signaller = new SimpleUISignall
er ();
+
signal_manager = new SimpleSignalManag
er ();
try {
shared_ptr<Film> film (new Film (output, false));
try {
shared_ptr<Film> film (new Film (output, false));
@@
-184,7
+184,7
@@
main (int argc, char* argv[])
JobManager* jm = JobManager::instance ();
while (jm->work_to_do ()) {}
JobManager* jm = JobManager::instance ();
while (jm->work_to_do ()) {}
- while (
ui_signall
er->ui_idle() > 0) {}
+ while (
signal_manag
er->ui_idle() > 0) {}
ContentList content = film->content ();
for (ContentList::iterator i = content.begin(); i != content.end(); ++i) {
ContentList content = film->content ();
for (ContentList::iterator i = content.begin(); i != content.end(); ++i) {