Hand-apply 306fd00490daf4f447db1f25811a9c61ad76274a from master; increase maximum...

diff --git a/TO_PORT b/TO_PORT
index 61bf60756934dcaeeccc90d30f8775b273540b13..c6b782937f5e71aa66407f1f526cbdaf38a62eb4 100644 (file)
--- a/TO_PORT
+++ b/TO_PORT
@@ -1,4 +1,3 @@
-9e262e2b929bc0df5e2562c9e3a1bab3a2175acb
 4a9fbbf59a273a7d7be778cc3f8c27aed68ff49b
 20f9378678456f4c64f5d887e317a762faee6bde
 4af669f559e1afd5375c8e96ee65f651aea0ec9f

diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index c844d8262287a4c2103c3bf7b92d41fda2839ebe..e8cf8b2635309432e24d1bc4b6c5e7f7d2cf6962 100644 (file)
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -349,10 +349,17 @@ public:
                _issuer->SetValue (std_to_wx (config->dcp_issuer ()));
                _issuer->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&DefaultsPage::issuer_changed, this));
 
+               config->Changed.connect (boost::bind (&DefaultsPage::config_changed, this));
+
                return panel;
        }
 
 private:
+       void config_changed ()
+       {
+               _j2k_bandwidth->SetRange (50, Config::instance()->maximum_j2k_bandwidth() / 1000000);
+       }
+               
        void j2k_bandwidth_changed ()
        {
                Config::instance()->set_default_j2k_bandwidth (_j2k_bandwidth->GetValue() * 1000000);
@@ -1151,7 +1158,7 @@ public:
                
                Config* config = Config::instance ();
                
-               _maximum_j2k_bandwidth->SetRange (1, 500);
+               _maximum_j2k_bandwidth->SetRange (1, 1000);
                _maximum_j2k_bandwidth->SetValue (config->maximum_j2k_bandwidth() / 1000000);
                _maximum_j2k_bandwidth->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&AdvancedPage::maximum_j2k_bandwidth_changed, this));
                _allow_any_dcp_frame_rate->SetValue (config->allow_any_dcp_frame_rate ());