Rename add_standards() -> update_standards()

and make it clear the choice as well.

diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc
index 83f37c9de68ce97c7de6d5f55525174eabea921d..270544dd67b5a02d436f806f1095c73f5bb34e13 100644 (file)
--- a/src/wx/dcp_panel.cc
+++ b/src/wx/dcp_panel.cc
@@ -134,7 +134,7 @@ DCPPanel::DCPPanel(wxNotebook* n, shared_ptr<Film> 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> 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> 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 c686a9c557317dd07f213c1e4925d46057e69557..4988922a8b8dc10061124de2ae2a7146f6a3b585 100644 (file)
--- 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;