projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
tools
/
dcpomatic_create.cc
diff --git
a/src/tools/dcpomatic_create.cc
b/src/tools/dcpomatic_create.cc
index c75f8f9539ffe9f06d9b4d61936304ae038a7301..304f4f697ab6e8a031c44dd2a74c3b896f2c448a 100644
(file)
--- a/
src/tools/dcpomatic_create.cc
+++ b/
src/tools/dcpomatic_create.cc
@@
-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;
int option_index = 0;
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'},
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]);