X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_dialog.cc;h=39650d15718de466e8e5847ef93a4e1b766b2c9e;hb=8ef3014198e46957d0a79d4e006e5f82a345bfa7;hp=32864ca15974a9c400bb88da7c27efcbc75a17a0;hpb=5702637ee38f0349fd0b7f17f10bda581e795a9d;p=dcpomatic.git diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc index 32864ca15..39650d157 100644 --- a/src/wx/audio_dialog.cc +++ b/src/wx/audio_dialog.cc @@ -17,6 +17,7 @@ */ +#include #include "audio_dialog.h" #include "audio_plot.h" #include "audio_analysis.h" @@ -24,69 +25,177 @@ #include "wx_util.h" using boost::shared_ptr; +using boost::bind; +using boost::optional; -AudioDialog::AudioDialog (wxWindow* parent, boost::shared_ptr film) +AudioDialog::AudioDialog (wxWindow* parent) : wxDialog (parent, wxID_ANY, _("Audio"), wxDefaultPosition, wxSize (640, 512), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) , _plot (0) { wxBoxSizer* sizer = new wxBoxSizer (wxHORIZONTAL); _plot = new AudioPlot (this); - sizer->Add (_plot, 1); + sizer->Add (_plot, 1, wxALL | wxEXPAND, 12); - wxFlexGridSizer* table = new wxFlexGridSizer (2, 6, 6); + wxBoxSizer* side = new wxBoxSizer (wxVERTICAL); - add_label_to_sizer (table, this, _("Channel")); - _channel = new wxChoice (this, wxID_ANY); - table->Add (_channel, 1, wxEXPAND | wxALL, 6); + { + wxStaticText* m = new wxStaticText (this, wxID_ANY, _("Channels")); + side->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP, 16); + } + - sizer->Add (table); + for (int i = 0; i < MAX_AUDIO_CHANNELS; ++i) { + _channel_checkbox[i] = new wxCheckBox (this, wxID_ANY, std_to_wx (audio_channel_name (i))); + side->Add (_channel_checkbox[i], 1, wxEXPAND | wxALL, 3); + _channel_checkbox[i]->Connect (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler (AudioDialog::channel_clicked), 0, this); + } - set_film (film); + { + wxStaticText* m = new wxStaticText (this, wxID_ANY, _("Type")); + side->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP, 16); + } + + wxString const types[] = { + _("Peak"), + _("RMS") + }; + + for (int i = 0; i < AudioPoint::COUNT; ++i) { + _type_checkbox[i] = new wxCheckBox (this, wxID_ANY, types[i]); + side->Add (_type_checkbox[i], 1, wxEXPAND | wxALL, 3); + _type_checkbox[i]->Connect (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler (AudioDialog::type_clicked), 0, this); + } + + { + wxStaticText* m = new wxStaticText (this, wxID_ANY, _("Smoothing")); + side->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP, 16); + } + + _smoothing = new wxSlider (this, wxID_ANY, AudioPlot::max_smoothing / 2, 1, AudioPlot::max_smoothing); + _smoothing->Connect (wxID_ANY, wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler (AudioDialog::smoothing_changed), 0, this); + side->Add (_smoothing, 1, wxEXPAND); + + sizer->Add (side, 0, wxALL, 12); SetSizer (sizer); sizer->Layout (); sizer->SetSizeHints (this); - - _channel->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler (AudioDialog::channel_changed), 0, this); } void AudioDialog::set_film (boost::shared_ptr f) { - _film_connection.disconnect (); + _film_changed_connection.disconnect (); + _film_audio_analysis_succeeded_connection.disconnect (); + _film = f; + + try_to_load_analysis (); + setup_channels (); + _plot->set_gain (_film->audio_gain ()); + + _film_changed_connection = _film->Changed.connect (bind (&AudioDialog::film_changed, this, _1)); + _film_audio_analysis_succeeded_connection = _film->AudioAnalysisSucceeded.connect (bind (&AudioDialog::try_to_load_analysis, this)); + + SetTitle (wxString::Format (_("DVD-o-matic audio - %s"), std_to_wx(_film->name()).data())); +} + +void +AudioDialog::setup_channels () +{ + if (!_film->audio_stream()) { + return; + } + + AudioMapping m (_film->audio_stream()->channels ()); - shared_ptr a; + for (int i = 0; i < MAX_AUDIO_CHANNELS; ++i) { + if (m.dcp_to_source(static_cast(i))) { + _channel_checkbox[i]->Show (); + } else { + _channel_checkbox[i]->Hide (); + } + } +} - try { - a.reset (new AudioAnalysis (f->audio_analysis_path ())); - } catch (...) { +void +AudioDialog::try_to_load_analysis () +{ + shared_ptr a; + if (boost::filesystem::exists (_film->audio_analysis_path())) { + a.reset (new AudioAnalysis (_film->audio_analysis_path ())); + } else { + if (IsShown ()) { + _film->analyse_audio (); + } } _plot->set_analysis (a); - _channel->Clear (); - for (int i = 0; i < f->audio_stream()->channels(); ++i) { - _channel->Append (audio_channel_name (i)); + AudioMapping m (_film->audio_stream()->channels ()); + optional c = m.source_to_dcp (0); + if (c) { + _channel_checkbox[c.get()]->SetValue (true); + _plot->set_channel_visible (0, true); } - _channel->SetSelection (0); - - _film_connection = f->Changed.connect (bind (&AudioDialog::film_changed, this, _1)); + for (int i = 0; i < AudioPoint::COUNT; ++i) { + _type_checkbox[i]->SetValue (true); + _plot->set_type_visible (i, true); + } } void -AudioDialog::channel_changed (wxCommandEvent &) +AudioDialog::channel_clicked (wxCommandEvent& ev) { - _plot->set_channel (_channel->GetSelection ()); + int c = 0; + while (c < MAX_AUDIO_CHANNELS && ev.GetEventObject() != _channel_checkbox[c]) { + ++c; + } + + assert (c < MAX_AUDIO_CHANNELS); + + AudioMapping m (_film->audio_stream()->channels ()); + optional s = m.dcp_to_source (static_cast (c)); + if (s) { + _plot->set_channel_visible (s.get(), _channel_checkbox[c]->GetValue ()); + } } void AudioDialog::film_changed (Film::Property p) { - if (p == Film::AUDIO_GAIN) { + switch (p) { + case Film::AUDIO_GAIN: _plot->set_gain (_film->audio_gain ()); + break; + case Film::CONTENT_AUDIO_STREAM: + case Film::EXTERNAL_AUDIO: + case Film::USE_CONTENT_AUDIO: + setup_channels (); + break; + default: + break; } } + +void +AudioDialog::type_clicked (wxCommandEvent& ev) +{ + int t = 0; + while (t < AudioPoint::COUNT && ev.GetEventObject() != _type_checkbox[t]) { + ++t; + } + + assert (t < AudioPoint::COUNT); + + _plot->set_type_visible (t, _type_checkbox[t]->GetValue ()); +} + +void +AudioDialog::smoothing_changed (wxScrollEvent &) +{ + _plot->set_smoothing (_smoothing->GetValue ()); +}