X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_plot.cc;h=0e9e815e1cce07d83c095a8be90a6ba9f864cf94;hb=b9a1ad3df5f9d85fb7439efd93fede72b9b078af;hp=079f69cdc005cc03478f7a370376ef5909bd7d63;hpb=ff19a446391f6a1d379689d52a0ac33a2af250df;p=dcpomatic.git diff --git a/src/wx/audio_plot.cc b/src/wx/audio_plot.cc index 079f69cdc..0e9e815e1 100644 --- a/src/wx/audio_plot.cc +++ b/src/wx/audio_plot.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2018 Carl Hetherington + Copyright (C) 2013-2020 Carl Hetherington This file is part of DCP-o-matic. @@ -18,32 +18,45 @@ */ + #include "audio_plot.h" +#include "film_viewer.h" +#include "wx_util.h" #include "lib/audio_decoder.h" #include "lib/audio_analysis.h" #include "lib/compose.hpp" -#include "wx/wx_util.h" +#include "lib/maths_util.h" +#include "lib/warnings.h" +DCPOMATIC_DISABLE_WARNINGS #include -#include -#include +DCPOMATIC_ENABLE_WARNINGS +#include #include -using std::cout; -using std::vector; + using std::list; +using std::map; using std::max; using std::min; -using std::map; +using std::shared_ptr; +using std::vector; +using std::weak_ptr; using boost::bind; using boost::optional; -using boost::shared_ptr; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif +using namespace dcpomatic; + int const AudioPlot::_minimum = -70; int const AudioPlot::_cursor_size = 8; int const AudioPlot::max_smoothing = 128; -AudioPlot::AudioPlot (wxWindow* parent) + +AudioPlot::AudioPlot (wxWindow* parent, weak_ptr viewer) : wxPanel (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE) + , _viewer (viewer) , _smoothing (max_smoothing / 2) , _gain_correction (0) { @@ -86,10 +99,12 @@ AudioPlot::AudioPlot (wxWindow* parent) Bind (wxEVT_PAINT, boost::bind (&AudioPlot::paint, this)); Bind (wxEVT_MOTION, boost::bind (&AudioPlot::mouse_moved, this, _1)); Bind (wxEVT_LEAVE_WINDOW, boost::bind (&AudioPlot::mouse_leave, this, _1)); + Bind (wxEVT_LEFT_DOWN, boost::bind(&AudioPlot::left_down, this)); SetMinSize (wxSize (640, 512)); } + void AudioPlot::set_analysis (shared_ptr a) { @@ -102,6 +117,7 @@ AudioPlot::set_analysis (shared_ptr a) Refresh (); } + void AudioPlot::set_channel_visible (int c, bool v) { @@ -109,6 +125,7 @@ AudioPlot::set_channel_visible (int c, bool v) Refresh (); } + void AudioPlot::set_type_visible (int t, bool v) { @@ -116,6 +133,7 @@ AudioPlot::set_type_visible (int t, bool v) Refresh (); } + void AudioPlot::set_message (wxString s) { @@ -123,6 +141,7 @@ AudioPlot::set_message (wxString s) Refresh (); } + struct Metrics { double db_label_width; @@ -132,23 +151,27 @@ struct Metrics float y_scale; }; + void AudioPlot::paint () { wxPaintDC dc (this); - wxGraphicsContext* gc = wxGraphicsContext::Create (dc); + auto gc = wxGraphicsContext::Create (dc); if (!gc) { return; } + gc->SetAntialiasMode (wxANTIALIAS_DEFAULT); + if (!_analysis || _analysis->channels() == 0) { gc->SetFont (gc->CreateFont (*wxNORMAL_FONT)); gc->DrawText (_message, 32, 32); + delete gc; return; } - wxGraphicsPath h_grid = gc->CreatePath (); + auto h_grid = gc->CreatePath (); gc->SetFont (gc->CreateFont (*wxSMALL_FONT)); wxDouble db_label_height; wxDouble db_label_descent; @@ -177,7 +200,7 @@ AudioPlot::paint () /* Draw an x axis with marks */ - wxGraphicsPath v_grid = gc->CreatePath (); + auto v_grid = gc->CreatePath (); DCPOMATIC_ASSERT (_analysis->samples_per_point() != 0.0); double const pps = _analysis->sample_rate() * metrics.x_scale / _analysis->samples_per_point(); @@ -186,7 +209,7 @@ AudioPlot::paint () double const mark_interval = calculate_mark_interval (rint (128 / pps)); - DCPTime t = DCPTime::from_seconds (mark_interval); + auto t = DCPTime::from_seconds (mark_interval); while ((t.seconds() * pps) < data_width) { double tc = t.seconds (); int const h = tc / 3600; @@ -195,7 +218,7 @@ AudioPlot::paint () tc -= m * 60; int const s = tc; - wxString str = wxString::Format (wxT ("%02d:%02d:%02d"), h, m, s); + auto str = wxString::Format (wxT ("%02d:%02d:%02d"), h, m, s); wxDouble str_width; wxDouble str_height; wxDouble str_descent; @@ -216,11 +239,11 @@ AudioPlot::paint () if (_type_visible[AudioPoint::PEAK]) { for (int c = 0; c < MAX_DCP_AUDIO_CHANNELS; ++c) { - wxGraphicsPath p = gc->CreatePath (); + auto p = gc->CreatePath (); if (_channel_visible[c] && c < _analysis->channels()) { plot_peak (p, c, metrics); } - wxColour const col = _colours[c]; + auto const col = _colours[c]; gc->SetPen (wxPen (wxColour (col.Red(), col.Green(), col.Blue(), col.Alpha() / 2), 1, wxPENSTYLE_SOLID)); gc->StrokePath (p); } @@ -228,17 +251,17 @@ AudioPlot::paint () if (_type_visible[AudioPoint::RMS]) { for (int c = 0; c < MAX_DCP_AUDIO_CHANNELS; ++c) { - wxGraphicsPath p = gc->CreatePath (); + auto p = gc->CreatePath (); if (_channel_visible[c] && c < _analysis->channels()) { plot_rms (p, c, metrics); } - wxColour const col = _colours[c]; + auto const col = _colours[c]; gc->SetPen (wxPen (col, 1, wxPENSTYLE_SOLID)); gc->StrokePath (p); } } - wxGraphicsPath axes = gc->CreatePath (); + auto axes = gc->CreatePath (); axes.MoveToPoint (metrics.db_label_width, 0); axes.AddLineToPoint (metrics.db_label_width, metrics.height - metrics.y_origin); axes.AddLineToPoint (metrics.db_label_width + data_width, metrics.height - metrics.y_origin); @@ -246,19 +269,18 @@ AudioPlot::paint () gc->StrokePath (axes); if (_cursor) { - wxGraphicsPath cursor = gc->CreatePath (); + auto cursor = gc->CreatePath (); cursor.MoveToPoint (_cursor->draw.x - _cursor_size / 2, _cursor->draw.y - _cursor_size / 2); cursor.AddLineToPoint (_cursor->draw.x + _cursor_size / 2, _cursor->draw.y + _cursor_size / 2); cursor.MoveToPoint (_cursor->draw.x + _cursor_size / 2, _cursor->draw.y - _cursor_size / 2); cursor.AddLineToPoint (_cursor->draw.x - _cursor_size / 2, _cursor->draw.y + _cursor_size / 2); gc->StrokePath (cursor); - - } delete gc; } + float AudioPlot::y_for_linear (float p, Metrics const & metrics) const { @@ -266,9 +288,10 @@ AudioPlot::y_for_linear (float p, Metrics const & metrics) const p = 1e-4; } - return metrics.height - (20 * log10(p) - _minimum) * metrics.y_scale - metrics.y_origin; + return metrics.height - (linear_to_db(p) - _minimum) * metrics.y_scale - metrics.y_origin; } + void AudioPlot::plot_peak (wxGraphicsPath& path, int channel, Metrics const & metrics) const { @@ -293,7 +316,7 @@ AudioPlot::plot_peak (wxGraphicsPath& path, int channel, Metrics const & metrics Point ( wxPoint (metrics.db_label_width + i * metrics.x_scale, y_for_linear (peak, metrics)), DCPTime::from_frames (i * _analysis->samples_per_point(), _analysis->sample_rate()), - 20 * log10(peak) + linear_to_db(peak) ) ); } @@ -301,11 +324,12 @@ AudioPlot::plot_peak (wxGraphicsPath& path, int channel, Metrics const & metrics DCPOMATIC_ASSERT (_peak.find(channel) != _peak.end()); path.MoveToPoint (_peak[channel][0].draw); - BOOST_FOREACH (Point const & i, _peak[channel]) { + for (auto const& i: _peak[channel]) { path.AddLineToPoint (i.draw); } } + void AudioPlot::plot_rms (wxGraphicsPath& path, int channel, Metrics const & metrics) const { @@ -362,7 +386,7 @@ AudioPlot::plot_rms (wxGraphicsPath& path, int channel, Metrics const & metrics) Point ( wxPoint (metrics.db_label_width + i * metrics.x_scale, y_for_linear (p, metrics)), DCPTime::from_frames (i * _analysis->samples_per_point(), _analysis->sample_rate()), - 20 * log10(p) + linear_to_db(p) ) ); } @@ -370,11 +394,12 @@ AudioPlot::plot_rms (wxGraphicsPath& path, int channel, Metrics const & metrics) DCPOMATIC_ASSERT (_rms.find(channel) != _rms.end()); path.MoveToPoint (_rms[channel][0].draw); - BOOST_FOREACH (Point const & i, _rms[channel]) { + for (auto const& i: _rms[channel]) { path.AddLineToPoint (i.draw); } } + void AudioPlot::set_smoothing (int s) { @@ -384,6 +409,7 @@ AudioPlot::set_smoothing (int s) Refresh (); } + void AudioPlot::set_gain_correction (double gain) { @@ -391,17 +417,19 @@ AudioPlot::set_gain_correction (double gain) Refresh (); } + AudioPoint AudioPlot::get_point (int channel, int point) const { - AudioPoint p = _analysis->get_point (channel, point); + auto p = _analysis->get_point (channel, point); for (int i = 0; i < AudioPoint::COUNT; ++i) { - p[i] *= pow (10, _gain_correction / 20); + p[i] *= db_to_linear(_gain_correction); } return p; } + /** @param n Channel index. * @return Colour used by that channel in the plot. */ @@ -412,30 +440,46 @@ AudioPlot::colour (int n) const return _colours[n]; } + void -AudioPlot::search (map const & search, wxMouseEvent const & ev, double& min_dist, Point& min_point) const +AudioPlot::left_down () { - for (map::const_iterator i = search.begin(); i != search.end(); ++i) { - BOOST_FOREACH (Point const & j, i->second) { - double const dist = pow(ev.GetX() - j.draw.x, 2) + pow(ev.GetY() - j.draw.y, 2); - if (dist < min_dist) { - min_dist = dist; - min_point = j; - } + if (_cursor) { + if (auto fv = _viewer.lock()) { + fv->seek (_cursor->time, true); } } } + void AudioPlot::mouse_moved (wxMouseEvent& ev) { double min_dist = DBL_MAX; Point min_point; - search (_rms, ev, min_dist, min_point); - search (_peak, ev, min_dist, min_point); + auto search = [this](map const & search, wxMouseEvent const & ev, double& min_dist, Point& min_point) { + for (auto const& i: search) { + if (_channel_visible[i.first]) { + for (auto const& j: i.second) { + double const dist = pow(ev.GetX() - j.draw.x, 2) + pow(ev.GetY() - j.draw.y, 2); + if (dist < min_dist) { + min_dist = dist; + min_point = j; + } + } + } + } + }; - _cursor = optional (); + if (_type_visible[AudioPoint::RMS]) { + search (_rms, ev, min_dist, min_point); + } + if (_type_visible[AudioPoint::PEAK]) { + search (_peak, ev, min_dist, min_point); + } + + _cursor = boost::none; if (min_dist < DBL_MAX) { wxRect before (min_point.draw.x - _cursor_size / 2, min_point.draw.y - _cursor_size / 2, _cursor_size, _cursor_size); @@ -447,10 +491,11 @@ AudioPlot::mouse_moved (wxMouseEvent& ev) } } + void AudioPlot::mouse_leave (wxMouseEvent &) { - _cursor = optional (); + _cursor = boost::none; Refresh (); Cursor (optional(), optional()); }