From 836f45cf1b64701705c67aaca02376365d506c90 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 8 Dec 2014 13:17:11 +0000 Subject: [PATCH] Hand-apply 306fd00490daf4f447db1f25811a9c61ad76274a from master; increase maximum allowed JPEG2000 bandwidth. --- TO_PORT | 1 - src/wx/config_dialog.cc | 9 ++++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/TO_PORT b/TO_PORT index 61bf60756..c6b782937 100644 --- 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 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 ()); -- 2.30.2