From 044ae60c8c0da7dc1a6b667b657d342aa770c42b Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 2 Mar 2013 12:27:49 +0000 Subject: [PATCH] Offer non-stretching formats with video as well as still content (#69). --- src/lib/format.cc | 4 ++-- src/wx/film_editor.cc | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/lib/format.cc b/src/lib/format.cc index 0e4830cd7..7fb73d0f9 100644 --- a/src/lib/format.cc +++ b/src/lib/format.cc @@ -82,8 +82,8 @@ Format::setup_formats () _formats.push_back (new FixedFormat (178, libdcp::Size (1920, 1080), N_("178"), _("16:9"), N_("F"))); _formats.push_back (new FixedFormat (185, libdcp::Size (1998, 1080), N_("185"), _("Flat"), N_("F"))); _formats.push_back (new FixedFormat (239, libdcp::Size (2048, 858), N_("239"), _("Scope"), N_("S"))); - _formats.push_back (new VariableFormat (libdcp::Size (1998, 1080), N_("var-185"), _("Flat"), N_("F"))); - _formats.push_back (new VariableFormat (libdcp::Size (2048, 858), N_("var-239"), _("Scope"), N_("S"))); + _formats.push_back (new VariableFormat (libdcp::Size (1998, 1080), N_("var-185"), _("Flat without stretch"), N_("F"))); + _formats.push_back (new VariableFormat (libdcp::Size (2048, 858), N_("var-239"), _("Scope without stretch"), N_("S"))); } /** @param n Nickname. diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc index 362243ef3..24f6c2461 100644 --- a/src/wx/film_editor.cc +++ b/src/wx/film_editor.cc @@ -982,9 +982,7 @@ FilmEditor::setup_formats () vector fmt = Format::all (); for (vector::iterator i = fmt.begin(); i != fmt.end(); ++i) { - if (c == VIDEO && dynamic_cast (*i)) { - _formats.push_back (*i); - } else if (c == STILL && dynamic_cast (*i)) { + if (c == VIDEO || (c == STILL && dynamic_cast (*i))) { _formats.push_back (*i); } } -- 2.30.2