From cc56fc111c742ed5ec072fa0bbe0b950150d40c1 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 3 May 2013 00:56:16 +0100 Subject: Configurable default format and content type (#133). --- src/lib/film.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/lib/film.cc') diff --git a/src/lib/film.cc b/src/lib/film.cc index b0785df34..0ca374604 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) -- cgit v1.2.3 From a976a7222842b5506ab7451297675e5e1777b744 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 19 May 2013 00:08:38 +0100 Subject: ChangeLog; fix default format on set_content. --- ChangeLog | 5 +++++ src/lib/film.cc | 9 +-------- 2 files changed, 6 insertions(+), 8 deletions(-) (limited to 'src/lib/film.cc') diff --git a/ChangeLog b/ChangeLog index 1c1881989..8b079d59b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-05-19 Carl Hetherington + + * Hopefully fix load of decimal values (e.g. frame rates) + in non-English locales on Windows. + 2013-05-17 Carl Hetherington * Version 0.90 released. diff --git a/src/lib/film.cc b/src/lib/film.cc index 0ca374604..81c7de77f 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -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) { -- cgit v1.2.3