X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_panel.cc;h=bf73798dac5779f4000346b819133afc97b721de;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hp=8c3d6f6caa09932c1b7c311ae11c0fd1642a9881;hpb=9f940fe8533526b10eb9cf22a8772e122760c368;p=dcpomatic.git

diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc
index 8c3d6f6ca..bf73798da 100644
--- a/src/wx/audio_panel.cc
+++ b/src/wx/audio_panel.cc
@@ -43,9 +43,12 @@ using std::cout;
 using std::string;
 using std::list;
 using std::pair;
-using boost::dynamic_pointer_cast;
-using boost::shared_ptr;
+using std::dynamic_pointer_cast;
+using std::shared_ptr;
 using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 AudioPanel::AudioPanel (ContentPanel* p)
 	: ContentSubPanel (p, _("Audio"))
@@ -118,20 +121,13 @@ AudioPanel::AudioPanel (ContentPanel* p)
 void
 AudioPanel::add_to_grid ()
 {
-	bool const full = Config::instance()->interface_complexity() == Config::INTERFACE_FULL;
-
 	int r = 0;
 
-	_reference->Show (full);
-	_reference_note->Show (full);
-
-	if (full) {
-		wxBoxSizer* reference_sizer = new wxBoxSizer (wxVERTICAL);
-		reference_sizer->Add (_reference, 0);
-		reference_sizer->Add (_reference_note, 0);
-		_grid->Add (reference_sizer, wxGBPosition(r, 0), wxGBSpan(1, 4));
-		++r;
-	}
+	wxBoxSizer* reference_sizer = new wxBoxSizer (wxVERTICAL);
+	reference_sizer->Add (_reference, 0);
+	reference_sizer->Add (_reference_note, 0);
+	_grid->Add (reference_sizer, wxGBPosition(r, 0), wxGBSpan(1, 4));
+	++r;
 
 	_grid->Add (_show, wxGBPosition (r, 0), wxGBSpan (1, 2));
 	_grid->Add (_peak, wxGBPosition (r, 2), wxGBSpan (1, 2), wxALIGN_CENTER_VERTICAL);
@@ -145,25 +141,15 @@ AudioPanel::add_to_grid ()
 		_grid->Add (s, wxGBPosition(r, 1));
 	}
 
-	_gain_calculate_button->Show (full);
-
-	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);
+	_grid->Add (_gain_calculate_button, wxGBPosition(r, 2), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+	++r;
 
-	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;
-	}
+	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;
 }
 
 AudioPanel::~AudioPanel ()