X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fconfig_dialog.cc;h=e8cf8b2635309432e24d1bc4b6c5e7f7d2cf6962;hb=fe47588e80b35c07fc25b1d9e79bc13b6e439ff0;hp=8d8f44b4ecc6fa05366c05b6366ef7a925a11e30;hpb=b56bc3c45953fe113a9934b0d2ec2c1134de07ab;p=dcpomatic.git

diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index 8d8f44b4e..e8cf8b263 100644
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -277,10 +277,6 @@ public:
 		_isdcf_metadata_button = new wxButton (panel, wxID_ANY, _("Edit..."));
 		table->Add (_isdcf_metadata_button);
 
-		add_label_to_sizer (table, panel, _("Default scale to"), true);
-		_scale = new wxChoice (panel, wxID_ANY);
-		table->Add (_scale);
-		
 		add_label_to_sizer (table, panel, _("Default container"), true);
 		_container = new wxChoice (panel, wxID_ANY);
 		table->Add (_container);
@@ -322,14 +318,6 @@ public:
 		
 		_isdcf_metadata_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&DefaultsPage::edit_isdcf_metadata_clicked, this, parent));
 		
-		vector<VideoContentScale> scales = VideoContentScale::all ();
-		for (size_t i = 0; i < scales.size(); ++i) {
-			_scale->Append (std_to_wx (scales[i].name ()));
-			if (scales[i] == config->default_scale ()) {
-				_scale->SetSelection (i);
-			}
-		}
-
 		vector<Ratio const *> ratios = Ratio::all ();
 		for (size_t i = 0; i < ratios.size(); ++i) {
 			_container->Append (std_to_wx (ratios[i]->nickname ()));
@@ -338,7 +326,6 @@ public:
 			}
 		}
 		
-		_scale->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DefaultsPage::scale_changed, this));
 		_container->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DefaultsPage::container_changed, this));
 		
 		vector<DCPContentType const *> const ct = DCPContentType::all ();
@@ -362,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);
@@ -394,12 +388,6 @@ private:
 		Config::instance()->set_default_still_length (_still_length->GetValue ());
 	}
 
-	void scale_changed ()
-	{
-		vector<VideoContentScale> scale = VideoContentScale::all ();
-		Config::instance()->set_default_scale (scale[_scale->GetSelection()]);
-	}
-	
 	void container_changed ()
 	{
 		vector<Ratio const *> ratio = Ratio::all ();
@@ -426,7 +414,6 @@ private:
 #else
 	wxDirPickerCtrl* _directory;
 #endif
-	wxChoice* _scale;
 	wxChoice* _container;
 	wxChoice* _dcp_content_type;
 	wxTextCtrl* _issuer;
@@ -1171,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 ());