Don't offer full-frame containers unless 'allow any container' is enabled.

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 18955a8969283f618eaebd05ed8aaddd15f01435..a138cc8796f47a24c22ac92f0e0e9bfe11790e8e 100644 (file)
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -809,7 +809,7 @@ Config::write_config () const
        root->add_child("MaximumJ2KBandwidth")->add_child_text (raw_convert<string> (_maximum_j2k_bandwidth));
        /* [XML] AllowAnyDCPFrameRate 1 to allow users to specify any frame rate when creating DCPs, 0 to limit the GUI to standard rates. */
        root->add_child("AllowAnyDCPFrameRate")->add_child_text (_allow_any_dcp_frame_rate ? "1" : "0");
-       /* [XML] AllowAnyContainer 1 to allow users to user any container ratio for their DCP, 0 to limit the GUI to standard containers. */
+       /* [XML] AllowAnyContainer 1 to allow users to user any container ratio for their DCP, 0 to limit the GUI to DCI Flat/Scope */
        root->add_child("AllowAnyContainer")->add_child_text (_allow_any_container ? "1" : "0");
        /* [XML] ShowExperimentalAudioProcessors 1 to offer users the (experimental) audio upmixer processors, 0 to hide them */
        root->add_child("ShowExperimentalAudioProcessors")->add_child_text (_show_experimental_audio_processors ? "1" : "0");

diff --git a/src/lib/ratio.cc b/src/lib/ratio.cc
index 8a86ced59088ab3cbb50ba5fbeefe3768da353e2..93ad5755ddb5fe23abe637a357caee2c88d8d206 100644 (file)
--- a/src/lib/ratio.cc
+++ b/src/lib/ratio.cc
@@ -110,7 +110,6 @@ Ratio::containers ()
        vector<Ratio const *> r;
        r.push_back (Ratio::from_id ("185"));
        r.push_back (Ratio::from_id ("239"));
-       r.push_back (Ratio::from_id ("190"));
        return r;
 }
 

diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc
index fff0d2035289f91e774e0d2d10e36311027d13ce..a371690bd71af42ff0f4ef4ac8c2fc0b47355266 100644 (file)
--- a/src/wx/full_config_dialog.cc
+++ b/src/wx/full_config_dialog.cc
@@ -1245,7 +1245,7 @@ private:
                table->Add (_allow_any_dcp_frame_rate, 1, wxEXPAND | wxALL);
                table->AddSpacer (0);
 
-               _allow_any_container = new CheckBox (_panel, _("Allow non-standard container ratios"));
+               _allow_any_container = new CheckBox (_panel, _("Allow full-frame and non-standard container ratios"));
                table->Add (_allow_any_container, 1, wxEXPAND | wxALL);
                table->AddSpacer (0);