X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_dialog.cc;h=714bf78e4e6c5c35b9e552dcf144ebb45b75f7e5;hb=959e2b1a5c799427375fc8f7bb11389f699cfe21;hp=b8c7f7b7343b23af4b08f62361d68dd6747606cd;hpb=8fedaaa75c4586a4cc7ffb393bd71d1fdb091dc8;p=dcpomatic.git diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc index b8c7f7b73..714bf78e4 100644 --- a/src/wx/audio_dialog.cc +++ b/src/wx/audio_dialog.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2018 Carl Hetherington + Copyright (C) 2013-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,25 +18,30 @@ */ + #include "audio_dialog.h" #include "audio_plot.h" -#include "wx_util.h" -#include "static_text.h" #include "check_box.h" -#include "lib/audio_analysis.h" -#include "lib/film.h" +#include "static_text.h" +#include "wx_util.h" #include "lib/analyse_audio_job.h" +#include "lib/audio_analysis.h" #include "lib/audio_content.h" +#include "lib/film.h" #include "lib/job_manager.h" +#include "lib/maths_util.h" +#include #include #include #include + using std::cout; using std::list; -using std::vector; +using std::make_shared; using std::pair; using std::shared_ptr; +using std::vector; using std::weak_ptr; using boost::bind; using boost::optional; @@ -47,11 +52,12 @@ using namespace dcpomatic; using namespace boost::placeholders; #endif + /** @param parent Parent window. * @param film Film we are using. * @param content Content to analyse, or 0 to analyse all of the film's audio. */ -AudioDialog::AudioDialog (wxWindow* parent, shared_ptr film, weak_ptr viewer, shared_ptr content) +AudioDialog::AudioDialog (wxWindow* parent, shared_ptr film, FilmViewer& viewer, shared_ptr content) : wxDialog ( parent, wxID_ANY, @@ -68,18 +74,17 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr film, weak_ptraudio_channels ()) - , _plot (0) + , _plot (nullptr) { wxFont subheading_font (*wxNORMAL_FONT); subheading_font.SetWeight (wxFONTWEIGHT_BOLD); - wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL); - wxBoxSizer* lr_sizer = new wxBoxSizer (wxHORIZONTAL); + auto overall_sizer = new wxBoxSizer (wxVERTICAL); + auto lr_sizer = new wxBoxSizer (wxHORIZONTAL); - wxBoxSizer* left = new wxBoxSizer (wxVERTICAL); + auto left = new wxBoxSizer (wxVERTICAL); _cursor = new StaticText (this, wxT("Cursor: none")); left->Add (_cursor, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP); @@ -98,27 +103,27 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr film, weak_ptrAdd (left, 1, wxALL | wxEXPAND, 12); - wxBoxSizer* right = new wxBoxSizer (wxVERTICAL); + auto right = new wxBoxSizer (wxVERTICAL); { - wxStaticText* m = new StaticText (this, _("Channels")); + auto 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 < 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)); + _channel_checkbox[i]->bind(&AudioDialog::channel_clicked, this, _1); } show_or_hide_channel_checkboxes (); { - wxStaticText* m = new StaticText (this, _("Type")); + auto 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[] = { @@ -129,13 +134,13 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr film, weak_ptrAdd (_type_checkbox[i], 0, wxEXPAND | wxALL, 3); - _type_checkbox[i]->Bind (wxEVT_CHECKBOX, boost::bind (&AudioDialog::type_clicked, this, _1)); + _type_checkbox[i]->bind(&AudioDialog::type_clicked, this, _1); } { - wxStaticText* m = new StaticText (this, _("Smoothing")); + auto 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); @@ -147,7 +152,7 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr film, weak_ptrAdd (lr_sizer, 0, wxEXPAND); #ifdef DCPOMATIC_LINUX - wxSizer* buttons = CreateSeparatedButtonSizer (wxCLOSE); + auto buttons = CreateSeparatedButtonSizer (wxCLOSE); if (buttons) { overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder()); } @@ -158,12 +163,16 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr film, weak_ptrSetSizeHints (this); _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)); + _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()))); + if (content) { + SetTitle(wxString::Format(_("DCP-o-matic audio - %s"), std_to_wx(content->path(0).string()))); + } else { + SetTitle(wxString::Format(_("DCP-o-matic audio - %s"), std_to_wx(film->directory().get().string()))); + } if (content) { - _playlist.reset (new Playlist ()); + _playlist = make_shared(); const_pointer_cast(_playlist)->add(film, content); } else { _playlist = film->playlist (); @@ -193,13 +202,13 @@ AudioDialog::try_to_load_analysis () return; } - shared_ptr film = _film.lock (); + auto film = _film.lock (); DCPOMATIC_ASSERT (film); - shared_ptr check = _content.lock(); + auto check = _content.lock(); - boost::filesystem::path const path = film->audio_analysis_path (_playlist); - if (!boost::filesystem::exists (path)) { + auto const path = film->audio_analysis_path (_playlist); + if (!dcp::filesystem::exists(path)) { _plot->set_analysis (shared_ptr ()); _analysis.reset (); @@ -247,7 +256,7 @@ AudioDialog::try_to_load_analysis () /* Nothing checked; check mapped ones */ list mapped; - shared_ptr content = _content.lock (); + auto content = _content.lock (); if (content) { mapped = content->audio->mapping().mapped_output_channels (); @@ -281,13 +290,13 @@ AudioDialog::try_to_load_analysis () void AudioDialog::analysis_finished () { - shared_ptr film = _film.lock (); + auto film = _film.lock (); if (!film) { /* This should not happen, but if it does we should just give up quietly */ return; } - if (!boost::filesystem::exists (film->audio_analysis_path (_playlist))) { + if (!dcp::filesystem::exists(film->audio_analysis_path(_playlist))) { /* We analysed and still nothing showed up, so maybe it was cancelled or it failed. Give up. */ @@ -312,13 +321,13 @@ AudioDialog::channel_clicked (wxCommandEvent& ev) } void -AudioDialog::film_change (ChangeType type, int p) +AudioDialog::film_change(ChangeType type, FilmProperty p) { if (type != ChangeType::DONE) { return; } - if (p == Film::AUDIO_CHANNELS) { + if (p == FilmProperty::AUDIO_CHANNELS) { auto film = _film.lock (); if (film) { _channels = film->audio_channels (); @@ -391,10 +400,13 @@ AudioDialog::setup_statistics () ) ); + wxColour const peaking = *wxRED; + wxColour const not_peaking = gui_is_dark() ? *wxWHITE : *wxBLACK; + if (peak_dB > -3) { - _sample_peak->SetForegroundColour (wxColour (255, 0, 0)); + _sample_peak->SetForegroundColour(peaking); } else { - _sample_peak->SetForegroundColour (wxColour (0, 0, 0)); + _sample_peak->SetForegroundColour(not_peaking); } if (_analysis->overall_true_peak()) { @@ -404,9 +416,9 @@ AudioDialog::setup_statistics () _true_peak->SetLabel (wxString::Format (_("True peak is %.2fdB"), peak_dB)); if (peak_dB > -3) { - _true_peak->SetForegroundColour (wxColour (255, 0, 0)); + _true_peak->SetForegroundColour(peaking); } else { - _true_peak->SetForegroundColour (wxColour (0, 0, 0)); + _true_peak->SetForegroundColour(not_peaking); } }