From 9458457504af5548bc51b3c29e65dbe92fd0513d Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 2 Jan 2018 17:48:54 +0000 Subject: Add test for incorrect ISDCF name with full-frame content, and fix it (#1118). --- src/lib/config.cc | 2 +- src/lib/hints.cc | 4 ++-- src/lib/ratio.cc | 22 +++++++++++----------- 3 files changed, 14 insertions(+), 14 deletions(-) (limited to 'src/lib') diff --git a/src/lib/config.cc b/src/lib/config.cc index 8dabcb71d..48568975e 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -496,7 +496,7 @@ Config::write_config () const if (_default_container) { /* [XML:opt] DefaultContainer ID of default container * to use when creating new films (185,239 or - * full-frame). + * 190). */ root->add_child("DefaultContainer")->add_child_text (_default_container->id ()); } diff --git a/src/lib/hints.cc b/src/lib/hints.cc index eb3cc73aa..b5edd7cc4 100644 --- a/src/lib/hints.cc +++ b/src/lib/hints.cc @@ -83,7 +83,7 @@ get_hints (shared_ptr film) Ratio const * r = i->video->scale().ratio (); if (r && r->id() == "239") { ++scope; - } else if (r && r->id() != "239" && r->id() != "full-frame") { + } else if (r && r->id() != "239" && r->id() != "190") { ++flat_or_narrower; } } @@ -99,7 +99,7 @@ get_hints (shared_ptr film) hints.push_back (_("All of your content is at 1.85:1 or narrower but your DCP's container is Scope (2.39:1). This will pillar-box your content inside a Flat (1.85:1) frame. You may prefer to set your DCP's container to Flat (1.85:1) in the \"DCP\" tab.")); } - if (film_container != "185" && film_container != "239" && film_container != "full-frame") { + if (film_container != "185" && film_container != "239" && film_container != "190") { hints.push_back (_("Your DCP uses an unusual container ratio. This may cause problems on some projectors. If possible, use Flat or Scope for the DCP container ratio")); } diff --git a/src/lib/ratio.cc b/src/lib/ratio.cc index 40be9558f..eae12b061 100644 --- a/src/lib/ratio.cc +++ b/src/lib/ratio.cc @@ -34,16 +34,16 @@ vector Ratio::_ratios; void Ratio::setup_ratios () { - _ratios.push_back (new Ratio (float(1290) / 1080, "119", _("1.19"), optional(), "119")); - _ratios.push_back (new Ratio (float(1440) / 1080, "133", _("1.33 (4:3)"), optional(), "133")); - _ratios.push_back (new Ratio (float(1485) / 1080, "138", _("1.38 (Academy)"), optional(), "137")); - _ratios.push_back (new Ratio (float(1544) / 1080, "143", _("1.43 (IMAX)"), optional(), "143")); - _ratios.push_back (new Ratio (float(1800) / 1080, "166", _("1.66"), optional(), "166")); - _ratios.push_back (new Ratio (float(1920) / 1080, "178", _("1.78 (16:9 or HD)"), optional(), "178")); - _ratios.push_back (new Ratio (float(1998) / 1080, "185", _("1.85 (Flat)"), string(_("DCI Flat")), "F")); - _ratios.push_back (new Ratio (float(2048) / 872, "235", _("2.35 (35mm Scope)"), optional(), "S")); - _ratios.push_back (new Ratio (float(2048) / 858, "239", _("2.39 (Scope)"), string(_("DCI Scope")), "S")); - _ratios.push_back (new Ratio (float(2048) / 1080, "full-frame", _("1.90 (Full frame)"), string(_("Full frame")), "C")); + _ratios.push_back (new Ratio (float(1290) / 1080, "119", _("1.19"), optional(), "119")); + _ratios.push_back (new Ratio (float(1440) / 1080, "133", _("1.33 (4:3)"), optional(), "133")); + _ratios.push_back (new Ratio (float(1485) / 1080, "138", _("1.38 (Academy)"), optional(), "137")); + _ratios.push_back (new Ratio (float(1544) / 1080, "143", _("1.43 (IMAX)"), optional(), "143")); + _ratios.push_back (new Ratio (float(1800) / 1080, "166", _("1.66"), optional(), "166")); + _ratios.push_back (new Ratio (float(1920) / 1080, "178", _("1.78 (16:9 or HD)"), optional(), "178")); + _ratios.push_back (new Ratio (float(1998) / 1080, "185", _("1.85 (Flat)"), string(_("DCI Flat")), "F")); + _ratios.push_back (new Ratio (float(2048) / 872, "235", _("2.35 (35mm Scope)"), optional(), "S")); + _ratios.push_back (new Ratio (float(2048) / 858, "239", _("2.39 (Scope)"), string(_("DCI Scope")), "S")); + _ratios.push_back (new Ratio (float(2048) / 1080, "190", _("1.90 (Full frame)"), string(_("Full frame")), "C")); } Ratio const * @@ -105,7 +105,7 @@ Ratio::containers () vector r; r.push_back (Ratio::from_id ("185")); r.push_back (Ratio::from_id ("239")); - r.push_back (Ratio::from_id ("full-frame")); + r.push_back (Ratio::from_id ("190")); return r; } -- cgit v1.2.3