diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-03-02 12:27:49 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-03-02 12:27:49 +0000 |
| commit | 044ae60c8c0da7dc1a6b667b657d342aa770c42b (patch) | |
| tree | 1effe3c87d6786ef0a82d9b9088d36cdee1cc657 /src | |
| parent | ab1a666e724911c41dfe08fc96748b38ace839c1 (diff) | |
Offer non-stretching formats with video as well as still content (#69).
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/format.cc | 4 | ||||
| -rw-r--r-- | 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<Format const *> fmt = Format::all (); for (vector<Format const *>::iterator i = fmt.begin(); i != fmt.end(); ++i) { - if (c == VIDEO && dynamic_cast<FixedFormat const *> (*i)) { - _formats.push_back (*i); - } else if (c == STILL && dynamic_cast<VariableFormat const *> (*i)) { + if (c == VIDEO || (c == STILL && dynamic_cast<VariableFormat const *> (*i))) { _formats.push_back (*i); } } |