diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-12-08 13:17:11 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-12-08 13:17:11 +0000 |
| commit | 836f45cf1b64701705c67aaca02376365d506c90 (patch) | |
| tree | 0037bffe04d216951231f29231488fa4b9023fe4 /src | |
| parent | f6a6f5c5313306fefe9a9a5ac7d3b873bf2f2bcd (diff) | |
Hand-apply 306fd00490daf4f447db1f25811a9c61ad76274a from master; increase maximum allowed JPEG2000 bandwidth.
Diffstat (limited to 'src')
| -rw-r--r-- | src/wx/config_dialog.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc index c844d8262..e8cf8b263 100644 --- 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 ()); |
