Remove default J2K bandwidth setting (already taken from template).

5 files changed, 1 insertions, 35 deletions

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 32d881a76..f74c6da1f 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -105,7 +105,6 @@ Config::set_defaults ()
 	_show_experimental_audio_processors = false;
 	_language = optional<string> ();
 	_default_still_length = 10;
-	_default_j2k_bandwidth = 150000000;
 	_default_audio_delay = 0;
 	_default_interop = false;
 	_default_metadata.clear ();
@@ -355,7 +354,6 @@ try
 	_dcp_j2k_comment = f.optional_string_child("DCPJ2KComment").get_value_or("");
 
 	_default_still_length = f.optional_number_child<int>("DefaultStillLength").get_value_or (10);
-	_default_j2k_bandwidth = f.optional_number_child<int>("DefaultJ2KBandwidth").get_value_or (200000000);
 	_default_audio_delay = f.optional_number_child<int>("DefaultAudioDelay").get_value_or (0);
 	_default_interop = f.optional_bool_child("DefaultInterop").get_value_or (false);
 
@@ -769,8 +767,6 @@ Config::write_config () const
 
 	/* [XML] DefaultStillLength Default length (in seconds) for still images in new films. */
 	root->add_child("DefaultStillLength")->add_child_text (raw_convert<string> (_default_still_length));
-	/* [XML] DefaultJ2KBandwidth Default bitrate (in bits per second) for JPEG2000 data in new films. */
-	root->add_child("DefaultJ2KBandwidth")->add_child_text (raw_convert<string> (_default_j2k_bandwidth));
 	/* [XML] DefaultAudioDelay Default delay to apply to audio (positive moves audio later) in milliseconds. */
 	root->add_child("DefaultAudioDelay")->add_child_text (raw_convert<string> (_default_audio_delay));
 	/* [XML] DefaultInterop 1 to default new films to Interop, 0 for SMPTE. */
diff --git a/src/lib/config.h b/src/lib/config.h
index 57b9b95bc..b7eef6827 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -219,10 +219,6 @@ public:
 		return _dcp_j2k_comment;
 	}
 
-	int default_j2k_bandwidth () const {
-		return _default_j2k_bandwidth;
-	}
-
 	int default_audio_delay () const {
 		return _default_audio_delay;
 	}
@@ -758,10 +754,6 @@ public:
 		maybe_set (_dcp_j2k_comment, c);
 	}
 
-	void set_default_j2k_bandwidth (int b) {
-		maybe_set (_default_j2k_bandwidth, b);
-	}
-
 	void set_default_audio_delay (int d) {
 		maybe_set (_default_audio_delay, d);
 	}
@@ -1320,7 +1312,6 @@ private:
 	std::string _dcp_product_name;
 	std::string _dcp_product_version;
 	std::string _dcp_j2k_comment;
-	int _default_j2k_bandwidth;
 	int _default_audio_delay;
 	bool _default_interop;
 	boost::optional<dcp::LanguageTag> _default_audio_language;
diff --git a/src/lib/film.cc b/src/lib/film.cc
index 0d76f6831..ba8de10bd 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -160,7 +160,7 @@ Film::Film (optional<boost::filesystem::path> dir)
 	, _resolution (Resolution::TWO_K)
 	, _encrypted (false)
 	, _context_id (dcp::make_uuid ())
-	, _j2k_bandwidth (Config::instance()->default_j2k_bandwidth ())
+	, _j2k_bandwidth(150000000)
 	, _video_frame_rate (24)
 	, _audio_channels(8)
 	, _three_d (false)
diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc
index c82e04099..f3d6977ab 100644
--- a/src/wx/full_config_dialog.cc
+++ b/src/wx/full_config_dialog.cc
@@ -305,15 +305,6 @@ private:
 		table->Add (_directory, 1, wxEXPAND);
 
 		{
-			add_label_to_sizer (table, _panel, _("Default JPEG2000 bandwidth"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
-			auto s = new wxBoxSizer (wxHORIZONTAL);
-			_j2k_bandwidth = new wxSpinCtrl (_panel);
-			s->Add (_j2k_bandwidth);
-			add_label_to_sizer (s, _panel, _("Mbit/s"), false, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
-			table->Add (s, 1);
-		}
-
-		{
 			add_label_to_sizer (table, _panel, _("Default audio delay"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 			auto s = new wxBoxSizer (wxHORIZONTAL);
 			_audio_delay = new wxSpinCtrl (_panel);
@@ -386,9 +377,6 @@ private:
 
 		_use_isdcf_name_by_default->bind(&DefaultsPage::use_isdcf_name_by_default_changed, this);
 
-		_j2k_bandwidth->SetRange (50, 250);
-		_j2k_bandwidth->Bind (wxEVT_SPINCTRL, boost::bind (&DefaultsPage::j2k_bandwidth_changed, this));
-
 		_audio_delay->SetRange (-1000, 1000);
 		_audio_delay->Bind (wxEVT_SPINCTRL, boost::bind (&DefaultsPage::audio_delay_changed, this));
 
@@ -420,8 +408,6 @@ private:
 		_kdm_directory->SetPath (std_to_wx (config->default_kdm_directory_or (wx_to_std (wxStandardPaths::Get().GetDocumentsDir())).string ()));
 		_kdm_type->set (config->default_kdm_type());
 		checked_set (_use_isdcf_name_by_default, config->use_isdcf_name_by_default());
-		checked_set (_j2k_bandwidth, config->default_j2k_bandwidth() / 1000000);
-		_j2k_bandwidth->SetRange (50, config->maximum_j2k_bandwidth() / 1000000);
 		checked_set (_audio_delay, config->default_audio_delay ());
 		checked_set (_standard, config->default_interop() ? 1 : 0);
 		auto dal = config->default_audio_language();
@@ -495,11 +481,6 @@ private:
 		config->set_default_kdm_duration (RoughDuration(duration, unit));
 	}
 
-	void j2k_bandwidth_changed ()
-	{
-		Config::instance()->set_default_j2k_bandwidth (_j2k_bandwidth->GetValue() * 1000000);
-	}
-
 	void audio_delay_changed ()
 	{
 		Config::instance()->set_default_audio_delay (_audio_delay->GetValue());
@@ -586,7 +567,6 @@ private:
 		}
 	}
 
-	wxSpinCtrl* _j2k_bandwidth;
 	wxSpinCtrl* _audio_delay;
 	wxSpinCtrl* _still_length;
 #ifdef DCPOMATIC_USE_OWN_PICKER
diff --git a/test/test.cc b/test/test.cc
index d11ede088..ca911c150 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -118,7 +118,6 @@ setup_test_config ()
 	Config::instance()->set_server_encoding_threads (1);
 	Config::instance()->set_server_port_base (61921);
 	Config::instance()->set_default_audio_delay (0);
-	Config::instance()->set_default_j2k_bandwidth (100000000);
 	Config::instance()->set_default_interop (false);
 	Config::instance()->set_default_still_length (10);
 	Config::instance()->set_log_types (