Rename j2k_bandwidth -> video_bit_rate.

3 files changed, 34 insertions, 34 deletions

diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc
index 781c95de7..c2f32fbb9 100644
--- a/src/wx/dcp_panel.cc
+++ b/src/wx/dcp_panel.cc
@@ -253,13 +253,13 @@ DCPPanel::name_changed ()
 
 
 void
-DCPPanel::j2k_bandwidth_changed ()
+DCPPanel::video_bit_rate_changed()
 {
 	if (!_film) {
 		return;
 	}
 
-	_film->set_j2k_bandwidth (_j2k_bandwidth->GetValue() * 1000000);
+	_film->set_video_bit_rate(_video_bit_rate->GetValue() * 1000000);
 }
 
 
@@ -385,8 +385,8 @@ DCPPanel::film_changed(FilmProperty p)
 		setup_container ();
 		setup_dcp_name ();
 		break;
-	case FilmProperty::J2K_BANDWIDTH:
-		checked_set (_j2k_bandwidth, _film->j2k_bandwidth() / 1000000);
+	case FilmProperty::VIDEO_BIT_RATE:
+		checked_set(_video_bit_rate, _film->video_bit_rate() / 1000000);
 		break;
 	case FilmProperty::USE_ISDCF_NAME:
 	{
@@ -605,7 +605,7 @@ DCPPanel::set_film (shared_ptr<Film> film)
 	film_changed(FilmProperty::CONTAINER);
 	film_changed(FilmProperty::RESOLUTION);
 	film_changed(FilmProperty::ENCRYPTED);
-	film_changed(FilmProperty::J2K_BANDWIDTH);
+	film_changed(FilmProperty::VIDEO_BIT_RATE);
 	film_changed(FilmProperty::VIDEO_FRAME_RATE);
 	film_changed(FilmProperty::AUDIO_CHANNELS);
 	film_changed(FilmProperty::SEQUENCE);
@@ -649,7 +649,7 @@ DCPPanel::setup_sensitivity ()
 	_frame_rate_spin->Enable        (_generally_sensitive && _film && !_film->references_dcp_video() && !_film->contains_atmos_content());
 	_audio_channels->Enable         (_generally_sensitive && _film && !_film->references_dcp_audio());
 	_audio_processor->Enable        (_generally_sensitive && _film && !_film->references_dcp_audio());
-	_j2k_bandwidth->Enable          (_generally_sensitive && _film && !_film->references_dcp_video());
+	_video_bit_rate->Enable         (_generally_sensitive && _film && !_film->references_dcp_video());
 	_container->Enable              (_generally_sensitive && _film && !_film->references_dcp_video());
 	_best_frame_rate->Enable (
 		_generally_sensitive &&
@@ -732,7 +732,7 @@ DCPPanel::reencode_j2k_changed ()
 void
 DCPPanel::config_changed (Config::Property p)
 {
-	_j2k_bandwidth->SetRange (1, Config::instance()->maximum_j2k_bandwidth() / 1000000);
+	_video_bit_rate->SetRange(1, Config::instance()->maximum_video_bit_rate() / 1000000);
 	setup_frame_rate_widget ();
 
 	if (p == Config::SHOW_EXPERIMENTAL_AUDIO_PROCESSORS) {
@@ -791,8 +791,8 @@ DCPPanel::make_video_panel ()
 
 	_three_d = new CheckBox (panel, _("3D"));
 
-	_j2k_bandwidth_label = create_label (panel, _("JPEG2000 bandwidth\nfor newly-encoded data"), true);
-	_j2k_bandwidth = new SpinCtrl (panel, DCPOMATIC_SPIN_CTRL_WIDTH);
+	_video_bit_rate_label = create_label(panel, _("Video bit rate\nfor newly-encoded data"), true);
+	_video_bit_rate = new SpinCtrl(panel, DCPOMATIC_SPIN_CTRL_WIDTH);
 	_mbits_label = create_label (panel, _("Mbit/s"), false);
 
 	_reencode_j2k = new CheckBox (panel, _("Re-encode JPEG2000 data from input"));
@@ -801,9 +801,9 @@ DCPPanel::make_video_panel ()
 	_frame_rate_choice->Bind (wxEVT_CHOICE,	  boost::bind(&DCPPanel::frame_rate_choice_changed, this));
 	_frame_rate_spin->Bind   (wxEVT_SPINCTRL, boost::bind(&DCPPanel::frame_rate_spin_changed, this));
 	_best_frame_rate->Bind	 (wxEVT_BUTTON,	  boost::bind(&DCPPanel::best_frame_rate_clicked, this));
-	_j2k_bandwidth->Bind	 (wxEVT_SPINCTRL, boost::bind(&DCPPanel::j2k_bandwidth_changed, this));
+	_video_bit_rate->Bind	 (wxEVT_SPINCTRL, boost::bind(&DCPPanel::video_bit_rate_changed, this));
 	/* Also listen to wxEVT_TEXT so that typing numbers directly in is always noticed */
-	_j2k_bandwidth->Bind	 (wxEVT_TEXT,     boost::bind(&DCPPanel::j2k_bandwidth_changed, this));
+	_video_bit_rate->Bind	 (wxEVT_TEXT,     boost::bind(&DCPPanel::video_bit_rate_changed, this));
 	_resolution->Bind        (wxEVT_CHOICE,   boost::bind(&DCPPanel::resolution_changed, this));
 	_three_d->bind(&DCPPanel::three_d_changed, this);
 	_reencode_j2k->bind(&DCPPanel::reencode_j2k_changed, this);
@@ -816,7 +816,7 @@ DCPPanel::make_video_panel ()
 		_frame_rate_choice->add(boost::lexical_cast<string>(i));
 	}
 
-	_j2k_bandwidth->SetRange (1, Config::instance()->maximum_j2k_bandwidth() / 1000000);
+	_video_bit_rate->SetRange(1, Config::instance()->maximum_video_bit_rate() / 1000000);
 	_frame_rate_spin->SetRange (1, 480);
 
 	_resolution->add(_("2K"));
@@ -860,9 +860,9 @@ DCPPanel::add_video_panel_to_grid ()
 	_video_grid->Add (_three_d, wxGBPosition (r, 0), wxGBSpan (1, 2));
 	++r;
 
-	add_label_to_sizer (_video_grid, _j2k_bandwidth_label, true, wxGBPosition (r, 0));
+	add_label_to_sizer(_video_grid, _video_bit_rate_label, true, wxGBPosition (r, 0));
 	auto s = new wxBoxSizer (wxHORIZONTAL);
-	s->Add (_j2k_bandwidth, 0, wxALIGN_CENTER_VERTICAL);
+	s->Add(_video_bit_rate, 0, wxALIGN_CENTER_VERTICAL);
 	add_label_to_sizer (s, _mbits_label, false, 0, wxLEFT | wxALIGN_CENTER_VERTICAL);
 	_video_grid->Add (s, wxGBPosition(r, 1), wxDefaultSpan);
 	++r;
diff --git a/src/wx/dcp_panel.h b/src/wx/dcp_panel.h
index 6c97a41c3..c686a9c55 100644
--- a/src/wx/dcp_panel.h
+++ b/src/wx/dcp_panel.h
@@ -71,7 +71,7 @@ private:
 	void copy_isdcf_name_button_clicked ();
 	void container_changed ();
 	void dcp_content_type_changed ();
-	void j2k_bandwidth_changed ();
+	void video_bit_rate_changed();
 	void frame_rate_choice_changed ();
 	void frame_rate_spin_changed ();
 	void best_frame_rate_clicked ();
@@ -129,9 +129,9 @@ private:
 	Choice* _container;
 	wxStaticText* _container_size;
 	wxButton* _copy_isdcf_name_button;
-	wxStaticText* _j2k_bandwidth_label;
+	wxStaticText* _video_bit_rate_label;
 	wxStaticText* _mbits_label;
- 	wxSpinCtrl* _j2k_bandwidth;
+ 	wxSpinCtrl* _video_bit_rate;
 	wxStaticText* _dcp_content_type_label;
 	Choice* _dcp_content_type;
 	wxStaticText* _frame_rate_label;
diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc
index 193392f29..c3c194fbc 100644
--- a/src/wx/full_config_dialog.cc
+++ b/src/wx/full_config_dialog.cc
@@ -322,8 +322,8 @@ private:
 		{
 			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);
+			_video_bit_rate = new wxSpinCtrl(_panel);
+			s->Add(_video_bit_rate);
 			add_label_to_sizer (s, _panel, _("Mbit/s"), false, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 			table->Add (s, 1);
 		}
@@ -410,8 +410,8 @@ private:
 		_dcp_content_type->Bind (wxEVT_CHOICE, boost::bind (&DefaultsPage::dcp_content_type_changed, this));
 		_dcp_audio_channels->Bind (wxEVT_CHOICE, boost::bind (&DefaultsPage::dcp_audio_channels_changed, this));
 
-		_j2k_bandwidth->SetRange (50, 250);
-		_j2k_bandwidth->Bind (wxEVT_SPINCTRL, boost::bind (&DefaultsPage::j2k_bandwidth_changed, this));
+		_video_bit_rate->SetRange(50, 250);
+		_video_bit_rate->Bind(wxEVT_SPINCTRL, boost::bind(&DefaultsPage::video_bit_rate_changed, this));
 
 		_audio_delay->SetRange (-1000, 1000);
 		_audio_delay->Bind (wxEVT_SPINCTRL, boost::bind (&DefaultsPage::audio_delay_changed, this));
@@ -451,8 +451,8 @@ 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(_video_bit_rate, config->default_video_bit_rate() / 1000000);
+		_video_bit_rate->SetRange(50, config->maximum_video_bit_rate() / 1000000);
 		checked_set (_dcp_audio_channels, locale_convert<string> (config->default_dcp_audio_channels()));
 		checked_set (_audio_delay, config->default_audio_delay ());
 		checked_set (_standard, config->default_interop() ? 1 : 0);
@@ -527,9 +527,9 @@ private:
 		config->set_default_kdm_duration (RoughDuration(duration, unit));
 	}
 
-	void j2k_bandwidth_changed ()
+	void video_bit_rate_changed()
 	{
-		Config::instance()->set_default_j2k_bandwidth (_j2k_bandwidth->GetValue() * 1000000);
+		Config::instance()->set_default_video_bit_rate(_video_bit_rate->GetValue() * 1000000);
 	}
 
 	void audio_delay_changed ()
@@ -634,7 +634,7 @@ private:
 		}
 	}
 
-	wxSpinCtrl* _j2k_bandwidth;
+	wxSpinCtrl* _video_bit_rate;
 	wxSpinCtrl* _audio_delay;
 	wxSpinCtrl* _still_length;
 #ifdef DCPOMATIC_USE_OWN_PICKER
@@ -1543,8 +1543,8 @@ private:
 		{
 			add_label_to_sizer(table, _panel, _("Maximum JPEG2000 bandwidth"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 			auto s = new wxBoxSizer(wxHORIZONTAL);
-			_maximum_j2k_bandwidth = new wxSpinCtrl(_panel);
-			s->Add(_maximum_j2k_bandwidth, 1);
+			_maximum_video_bit_rate = new wxSpinCtrl(_panel);
+			s->Add(_maximum_video_bit_rate, 1);
 			add_label_to_sizer(s, _panel, _("Mbit/s"), false, 0, wxLEFT | wxALIGN_CENTRE_VERTICAL);
 			table->Add(s, 1);
 		}
@@ -1579,8 +1579,8 @@ private:
 			table->Add(s, 1);
 		}
 
-		_maximum_j2k_bandwidth->SetRange(1, 1000);
-		_maximum_j2k_bandwidth->Bind(wxEVT_SPINCTRL, boost::bind(&NonStandardPage::maximum_j2k_bandwidth_changed, this));
+		_maximum_video_bit_rate->SetRange(1, 1000);
+		_maximum_video_bit_rate->Bind(wxEVT_SPINCTRL, boost::bind(&NonStandardPage::maximum_video_bit_rate_changed, this));
 		_allow_any_dcp_frame_rate->bind(&NonStandardPage::allow_any_dcp_frame_rate_changed, this);
 		_allow_any_container->bind(&NonStandardPage::allow_any_container_changed, this);
 		_allow_96khz_audio->bind(&NonStandardPage::allow_96khz_audio_changed, this);
@@ -1594,7 +1594,7 @@ private:
 	{
 		auto config = Config::instance();
 
-		checked_set(_maximum_j2k_bandwidth, config->maximum_j2k_bandwidth() / 1000000);
+		checked_set(_maximum_video_bit_rate, config->maximum_video_bit_rate() / 1000000);
 		checked_set(_allow_any_dcp_frame_rate, config->allow_any_dcp_frame_rate());
 		checked_set(_allow_any_container, config->allow_any_container());
 		checked_set(_allow_96khz_audio, config->allow_96khz_audio());
@@ -1603,9 +1603,9 @@ private:
 		checked_set(_isdcf_name_part_length, config->isdcf_name_part_length());
 	}
 
-	void maximum_j2k_bandwidth_changed()
+	void maximum_video_bit_rate_changed()
 	{
-		Config::instance()->set_maximum_j2k_bandwidth(_maximum_j2k_bandwidth->GetValue() * 1000000);
+		Config::instance()->set_maximum_video_bit_rate(_maximum_video_bit_rate->GetValue() * 1000000);
 	}
 
 	void allow_any_dcp_frame_rate_changed()
@@ -1638,7 +1638,7 @@ private:
 		Config::instance()->set_isdcf_name_part_length(_isdcf_name_part_length->GetValue());
 	}
 
-	wxSpinCtrl* _maximum_j2k_bandwidth = nullptr;
+	wxSpinCtrl* _maximum_video_bit_rate = nullptr;
 	CheckBox* _allow_any_dcp_frame_rate = nullptr;
 	CheckBox* _allow_any_container = nullptr;
 	CheckBox* _allow_96khz_audio = nullptr;