Offer non-stretching formats with video as well as still content (#69).

diff --git a/src/lib/format.cc b/src/lib/format.cc
index 0e4830cd7afc3ffbb38e312946253e401162a6fd..7fb73d0f9264580653b2d89e67795a19dbd37333 100644 (file)
--- 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 362243ef300fd227afef169450fc2cdae2867de4..24f6c24612a524561945f4a344c5e6a1a42527fd 100644 (file)
--- 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);
                }
        }