projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No-op: remove all trailing whitespace.
[dcpomatic.git]
/
src
/
tools
/
dcpomatic_create.cc
diff --git
a/src/tools/dcpomatic_create.cc
b/src/tools/dcpomatic_create.cc
index c75f8f9539ffe9f06d9b4d61936304ae038a7301..d4d4df29b814f109066c0d87dc1ad3ae910a0288 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 () {}
};
@@
-74,14
+74,14
@@
main (int argc, char* argv[])
dcpomatic_setup ();
string name;
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;
Ratio const * container_ratio = 0;
Ratio const * content_ratio = 0;
int still_length = 10;
boost::filesystem::path output;
-
+
int option_index = 0;
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'},
@@
-110,7
+110,7
@@
main (int argc, char* argv[])
name = optarg;
break;
case 'c':
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]);
if (dcp_content_type == 0) {
cerr << "Bad DCP content type.\n";
help (argv[0]);
@@
-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));
@@
-171,7
+171,7
@@
main (int argc, char* argv[])
film->set_container (container_ratio);
film->set_dcp_content_type (dcp_content_type);
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);
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);
@@
-180,17
+180,17
@@
main (int argc, char* argv[])
}
film->examine_and_add_content (c);
}
}
film->examine_and_add_content (c);
}
-
+
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) {
shared_ptr<ImageContent> ic = dynamic_pointer_cast<ImageContent> (*i);
if (ic) {
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
);
}
}
}
}
@@
-214,6
+214,6
@@
main (int argc, char* argv[])
cerr << argv[0] << ": " << e.what() << "\n";
exit (EXIT_FAILURE);
}
cerr << argv[0] << ": " << e.what() << "\n";
exit (EXIT_FAILURE);
}
-
+
return 0;
}
return 0;
}