diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-05-21 12:56:47 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-05-21 12:56:47 +0100 |
| commit | 5f0f0de782100a5cb558f30c7768c8af0c19bcb7 (patch) | |
| tree | acb5c1624e6b5687f94eca0882c37afb0971018c /src/lib/film.cc | |
| parent | 3fc3aad8735903ced3dae65f764eb33e3f5b3f11 (diff) | |
| parent | 47e6b6725168213f2a7db24c2965cfa173f755b4 (diff) | |
Merge master.
Diffstat (limited to 'src/lib/film.cc')
| -rw-r--r-- | src/lib/film.cc | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/lib/film.cc b/src/lib/film.cc index b0785df34..81c7de77f 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -88,8 +88,8 @@ int const Film::state_version = 4; Film::Film (string d, bool must_exist) : _use_dci_name (true) , _trust_content_header (true) - , _dcp_content_type (0) - , _format (0) + , _dcp_content_type (Config::instance()->default_dcp_content_type ()) + , _format (Config::instance()->default_format ()) , _scaler (Scaler::from_id ("bicubic")) , _trim_start (0) , _trim_end (0) @@ -987,14 +987,7 @@ Film::set_content (string c) } /* Default format */ - switch (content_type()) { - case STILL: - set_format (Format::from_id ("var-185")); - break; - case VIDEO: - set_format (Format::from_id ("185")); - break; - } + set_format (Config::instance()->default_format ()); /* Still image DCPs must use external audio */ if (content_type() == STILL) { |