X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_dialog.cc;h=ea7cc60dd0d135044ce8acc94c452bcc5fc8ffa0;hb=50cb31af16240b248700dab1484d7f07656c66df;hp=701c8263a48b27e8a8391da28865eae1fb516dc1;hpb=2eb98dd87bb359ae333247af55b650fced7f6311;p=dcpomatic.git diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc index 701c8263a..ea7cc60dd 100644 --- a/src/wx/audio_dialog.cc +++ b/src/wx/audio_dialog.cc @@ -18,10 +18,10 @@ */ #include +#include "lib/audio_analysis.h" +#include "lib/film.h" #include "audio_dialog.h" #include "audio_plot.h" -#include "audio_analysis.h" -#include "film.h" #include "wx_util.h" using boost::shared_ptr; @@ -29,26 +29,32 @@ using boost::bind; using boost::optional; AudioDialog::AudioDialog (wxWindow* parent) - : wxDialog (parent, wxID_ANY, _("Audio"), wxDefaultPosition, wxSize (640, 512), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) + : wxDialog (parent, wxID_ANY, _("Audio"), wxDefaultPosition, wxSize (640, 512), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE) , _plot (0) { wxBoxSizer* sizer = new wxBoxSizer (wxHORIZONTAL); _plot = new AudioPlot (this); - sizer->Add (_plot, 1, wxALL, 12); + sizer->Add (_plot, 1, wxALL | wxEXPAND, 12); - wxFlexGridSizer* table = new wxFlexGridSizer (2, 6, 6); + wxBoxSizer* side = new wxBoxSizer (wxVERTICAL); + + { + wxStaticText* m = new wxStaticText (this, wxID_ANY, _("Channels")); + side->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP, 16); + } for (int i = 0; i < MAX_AUDIO_CHANNELS; ++i) { - _channel_checkbox[i] = new wxCheckBox (this, wxID_ANY, audio_channel_name (i)); - table->Add (_channel_checkbox[i], 1, wxEXPAND); - table->AddSpacer (0); + _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); } - table->AddSpacer (0); - table->AddSpacer (0); - + { + wxStaticText* m = new wxStaticText (this, wxID_ANY, _("Type")); + side->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP, 16); + } + wxString const types[] = { _("Peak"), _("RMS") @@ -56,12 +62,20 @@ AudioDialog::AudioDialog (wxWindow* parent) for (int i = 0; i < AudioPoint::COUNT; ++i) { _type_checkbox[i] = new wxCheckBox (this, wxID_ANY, types[i]); - table->Add (_type_checkbox[i], 1, wxEXPAND); - table->AddSpacer (0); + 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); } - sizer->Add (table, 0, wxALL, 12); + { + 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 (); @@ -69,62 +83,40 @@ AudioDialog::AudioDialog (wxWindow* parent) } void -AudioDialog::set_film (boost::shared_ptr f) +AudioDialog::set_content (shared_ptr c) { - _film_changed_connection.disconnect (); - _film_audio_analysis_finished_connection.disconnect (); + _content_changed_connection.disconnect (); - _film = f; + _content = c; try_to_load_analysis (); - setup_channels (); - _plot->set_gain (_film->audio_gain ()); + _plot->set_gain (_content->audio_gain ()); - _film_changed_connection = _film->Changed.connect (bind (&AudioDialog::film_changed, this, _1)); - _film_audio_analysis_finished_connection = _film->AudioAnalysisFinished.connect (bind (&AudioDialog::try_to_load_analysis, this)); + _content_changed_connection = _content->Changed.connect (bind (&AudioDialog::content_changed, this, _2)); - SetTitle (String::compose ("DVD-o-matic audio - %1", _film->name())); + SetTitle (wxString::Format (_("DCP-o-matic audio - %s"), std_to_wx(_content->file().filename().string()).data())); } -void -AudioDialog::setup_channels () -{ - if (!_film->audio_stream()) { - return; - } - - AudioMapping m (_film->audio_stream()->channels ()); - - 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 (); - } - } -} 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 ())); + if (boost::filesystem::exists (_content->audio_analysis_path())) { + a.reset (new AudioAnalysis (_content->audio_analysis_path ())); } else { if (IsShown ()) { - _film->analyse_audio (); + _content->analyse_audio (bind (&AudioDialog::try_to_load_analysis, this)); } } _plot->set_analysis (a); - 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); + if (_channel_checkbox[0]) { + _channel_checkbox[0]->SetValue (true); } + _plot->set_channel_visible (0, true); for (int i = 0; i < AudioPoint::COUNT; ++i) { _type_checkbox[i]->SetValue (true); @@ -142,27 +134,14 @@ AudioDialog::channel_clicked (wxCommandEvent& ev) 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 ()); - } + _plot->set_channel_visible (c, _channel_checkbox[c]->GetValue ()); } void -AudioDialog::film_changed (Film::Property p) +AudioDialog::content_changed (int p) { - 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; + if (p == AudioContentProperty::AUDIO_GAIN) { + _plot->set_gain (_content->audio_gain ()); } } @@ -178,3 +157,9 @@ AudioDialog::type_clicked (wxCommandEvent& ev) _plot->set_type_visible (t, _type_checkbox[t]->GetValue ()); } + +void +AudioDialog::smoothing_changed (wxScrollEvent &) +{ + _plot->set_smoothing (_smoothing->GetValue ()); +}