From 785f6d62bc8183b4fa7e87601bece847989cf0e3 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 18 Jan 2025 18:52:44 +0100 Subject: Rename add_standards() -> update_standards() and make it clear the choice as well. --- src/wx/dcp_panel.cc | 11 +++++------ src/wx/dcp_panel.h | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc index 83f37c9de..270544dd6 100644 --- a/src/wx/dcp_panel.cc +++ b/src/wx/dcp_panel.cc @@ -134,7 +134,7 @@ DCPPanel::DCPPanel(wxNotebook* n, shared_ptr film, FilmViewer& viewer) _dcp_content_type->add_entry(i->pretty_name()); } - add_standards(); + update_standards(); _standard->SetToolTip(_("The standard that the DCP should use. Interop is older, and SMPTE is the newer (current) standard. If in doubt, choose 'SMPTE'")); Config::instance()->Changed.connect (boost::bind(&DCPPanel::config_changed, this, _1)); @@ -144,8 +144,9 @@ DCPPanel::DCPPanel(wxNotebook* n, shared_ptr film, FilmViewer& viewer) void -DCPPanel::add_standards() +DCPPanel::update_standards() { + _standard->Clear(); _standard->add_entry(_("SMPTE"), string{"smpte"}); if (Config::instance()->allow_smpte_bv20() || (_film && _film->limit_to_smpte_bv20())) { _standard->add_entry(_("SMPTE (Bv2.0 only)"), string{"smpte-bv20"}); @@ -613,8 +614,7 @@ DCPPanel::set_film (shared_ptr film) return; } - _standard->Clear(); - add_standards(); + update_standards(); film_changed(FilmProperty::NAME); film_changed(FilmProperty::USE_ISDCF_NAME); @@ -763,8 +763,7 @@ DCPPanel::config_changed (Config::Property p) film_changed(FilmProperty::AUDIO_PROCESSOR); } } else if (p == Config::ALLOW_SMPTE_BV20) { - _standard->Clear(); - add_standards(); + update_standards(); if (_film) { film_changed(FilmProperty::INTEROP); film_changed(FilmProperty::LIMIT_TO_SMPTE_BV20); diff --git a/src/wx/dcp_panel.h b/src/wx/dcp_panel.h index c686a9c55..4988922a8 100644 --- a/src/wx/dcp_panel.h +++ b/src/wx/dcp_panel.h @@ -98,7 +98,7 @@ private: void add_video_panel_to_grid (); void add_audio_panel_to_grid (); void add_audio_processors (); - void add_standards(); + void update_standards(); void set_standard(); int minimum_allowed_audio_channels () const; -- cgit v1.2.3