More GL build fixes.

[dcpomatic.git] / src / wx / audio_panel.cc

diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc
index 1c6ed1583d5ea1aef0b611628d229933459f1c60..ccdb579079dc166ef79acc1269760de64ae2f0ea 100644 (file)
--- a/src/wx/audio_panel.cc
+++ b/src/wx/audio_panel.cc
@@ -118,14 +118,14 @@ AudioPanel::AudioPanel (ContentPanel* p)
 void
 AudioPanel::add_to_grid ()
 {
-       Config::Interface const interface = Config::instance()->interface_complexity();
+       bool const full = Config::instance()->interface_complexity() == Config::INTERFACE_FULL;
 
        int r = 0;
 
-       _reference->Show (interface == Config::INTERFACE_FULL);
-       _reference_note->Show (interface == Config::INTERFACE_FULL);
+       _reference->Show (full);
+       _reference_note->Show (full);
 
-       if (interface == Config::INTERFACE_FULL) {
+       if (full) {
                wxBoxSizer* reference_sizer = new wxBoxSizer (wxVERTICAL);
                reference_sizer->Add (_reference, 0);
                reference_sizer->Add (_reference_note, 0);
@@ -144,18 +144,26 @@ AudioPanel::add_to_grid ()
                s->Add (_gain_db_label, 0, wxALIGN_CENTER_VERTICAL);
                _grid->Add (s, wxGBPosition(r, 1));
        }
-       _grid->Add (_gain_calculate_button, wxGBPosition(r, 2), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
 
-       ++r;
+       _gain_calculate_button->Show (full);
 
-       add_label_to_sizer (_grid, _delay_label, true, wxGBPosition(r, 0));
-       {
+       if (full) {
+               _grid->Add (_gain_calculate_button, wxGBPosition(r, 2), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+               ++r;
+       }
+
+       _delay_label->Show (full);
+       _delay->show (full);
+       _delay_ms_label->Show (full);
+
+       if (full) {
+               add_label_to_sizer (_grid, _delay_label, true, wxGBPosition(r, 0));
                wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
                s->Add (_delay->wrapped(), 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6);
                s->Add (_delay_ms_label, 0, wxALIGN_CENTER_VERTICAL);
                _grid->Add (s, wxGBPosition(r, 1));
+               ++r;
        }
-       ++r;
 }
 
 AudioPanel::~AudioPanel ()
@@ -169,6 +177,10 @@ AudioPanel::~AudioPanel ()
 void
 AudioPanel::film_changed (Film::Property property)
 {
+       if (!_parent->film()) {
+               return;
+       }
+
        switch (property) {
        case Film::AUDIO_CHANNELS:
        case Film::AUDIO_PROCESSOR: