summaryrefslogtreecommitdiff
path: root/src/tools
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-12-03 10:12:35 +0000
committerCarl Hetherington <cth@carlh.net>2014-12-03 10:12:35 +0000
commitc008066160d85b9ec9e5485375d7baaa5d27bda2 (patch)
treecf2876d69549119bf22761c5f6eccb568242b647 /src/tools
parent996fa2194581bf95113b9778849654893c414889 (diff)
Hand-apply 6a3cd511559433554ab40ed72ff94b7d8dc2c5bd from master;
Basics of an image sequence dialog that asks about frame rate and digest calculation.
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/dcpomatic.cc2
-rw-r--r--src/tools/dcpomatic_create.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 58cb32c53..b0df7b32c 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -786,7 +786,7 @@ class App : public wxApp
if (!_film_to_create.empty ()) {
_frame->new_film (_film_to_create);
if (!_content_to_add.empty ()) {
- _frame->film()->examine_and_add_content (content_factory (_frame->film(), _content_to_add));
+ _frame->film()->examine_and_add_content (content_factory (_frame->film(), _content_to_add), true);
}
}
diff --git a/src/tools/dcpomatic_create.cc b/src/tools/dcpomatic_create.cc
index 304f4f697..6e8f16888 100644
--- a/src/tools/dcpomatic_create.cc
+++ b/src/tools/dcpomatic_create.cc
@@ -178,7 +178,7 @@ main (int argc, char* argv[])
if (vc) {
vc->set_scale (VideoContentScale (content_ratio));
}
- film->examine_and_add_content (c);
+ film->examine_and_add_content (c, true);
}
JobManager* jm = JobManager::instance ();