using boost::optional;
using boost::const_pointer_cast;
using boost::dynamic_pointer_cast;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
/** @param parent Parent window.
* @param film Film we are using.
{
wxStaticText* m = new StaticText (this, _("Channels"));
m->SetFont (subheading_font);
- right->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM, 16);
+ right->Add (m, 1, wxTOP | wxBOTTOM, 16);
}
- for (int i = 0; i < _channels; ++i) {
+ for (int i = 0; i < MAX_DCP_AUDIO_CHANNELS; ++i) {
_channel_checkbox[i] = new CheckBox (this, std_to_wx(audio_channel_name(i)));
_channel_checkbox[i]->SetForegroundColour(wxColour(_plot->colour(i)));
right->Add (_channel_checkbox[i], 0, wxEXPAND | wxALL, 3);
_channel_checkbox[i]->Bind (wxEVT_CHECKBOX, boost::bind (&AudioDialog::channel_clicked, this, _1));
}
- for (int i = _channels; i < MAX_DCP_AUDIO_CHANNELS; ++i) {
- _channel_checkbox[i] = 0;
- }
+ show_or_hide_channel_checkboxes ();
{
wxStaticText* m = new StaticText (this, _("Type"));
m->SetFont (subheading_font);
- right->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP, 16);
+ right->Add (m, 1, wxTOP, 16);
}
wxString const types[] = {
{
wxStaticText* m = new StaticText (this, _("Smoothing"));
m->SetFont (subheading_font);
- right->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP, 16);
+ right->Add (m, 1, wxTOP, 16);
}
_smoothing = new wxSlider (this, wxID_ANY, AudioPlot::max_smoothing / 2, 1, AudioPlot::max_smoothing);
overall_sizer->Layout ();
overall_sizer->SetSizeHints (this);
- _film_connection = film->ContentChange.connect (boost::bind (&AudioDialog::content_change, this, _1, _3));
+ _film_connection = film->Change.connect (boost::bind(&AudioDialog::film_change, this, _1, _2));
+ _film_content_connection = film->ContentChange.connect (boost::bind (&AudioDialog::content_change, this, _1, _3));
DCPOMATIC_ASSERT (film->directory());
SetTitle(wxString::Format(_("DCP-o-matic audio - %s"), std_to_wx(film->directory().get().string())));
_plot->Cursor.connect (bind (&AudioDialog::set_cursor, this, _1, _2));
}
+
+void
+AudioDialog::show_or_hide_channel_checkboxes ()
+{
+ for (int i = 0; i < _channels; ++i) {
+ _channel_checkbox[i]->Show ();
+ }
+
+ for (int i = _channels; i < MAX_DCP_AUDIO_CHANNELS; ++i) {
+ _channel_checkbox[i]->Hide ();
+ }
+}
+
+
void
AudioDialog::try_to_load_analysis ()
{
_plot->set_analysis (_analysis);
_plot->set_gain_correction (_analysis->gain_correction (_playlist));
setup_statistics ();
+ show_or_hide_channel_checkboxes ();
/* Set up some defaults if no check boxes are checked */
_plot->set_channel_visible (c, _channel_checkbox[c]->GetValue ());
}
+void
+AudioDialog::film_change (ChangeType type, int p)
+{
+ if (type != CHANGE_TYPE_DONE) {
+ return;
+ }
+
+ if (p == Film::AUDIO_CHANNELS) {
+ shared_ptr<Film> film = _film.lock ();
+ if (film) {
+ _channels = film->audio_channels ();
+ try_to_load_analysis ();
+ }
+ }
+}
+
void
AudioDialog::content_change (ChangeType type, int p)
{