X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Faudio_plot.cc;h=cb10908df821b432dc68692b51c9e1e67fdcc283;hp=19e7bdac8420a48de65212dbfdcd631430d8bfee;hb=a5d004b0773f633401528392fc28e66d70e13ac8;hpb=37c28f4c76df89bc84d773beda1bb90be1cedd1a diff --git a/src/wx/audio_plot.cc b/src/wx/audio_plot.cc index 19e7bdac8..cb10908df 100644 --- a/src/wx/audio_plot.cc +++ b/src/wx/audio_plot.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2015 Carl Hetherington + Copyright (C) 2013-2020 Carl Hetherington This file is part of DCP-o-matic. @@ -19,27 +19,38 @@ */ #include "audio_plot.h" +#include "wx_util.h" +#include "film_viewer.h" #include "lib/audio_decoder.h" #include "lib/audio_analysis.h" #include "lib/compose.hpp" -#include "wx/wx_util.h" #include -#include +#include #include +#include using std::cout; using std::vector; using std::list; using std::max; using std::min; +using std::map; using boost::bind; -using boost::shared_ptr; +using boost::optional; +using std::shared_ptr; +using std::weak_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) { @@ -80,6 +91,9 @@ AudioPlot::AudioPlot (wxWindow* parent) #endif 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)); } @@ -139,6 +153,7 @@ AudioPlot::paint () if (!_analysis || _analysis->channels() == 0) { gc->SetFont (gc->CreateFont (*wxNORMAL_FONT)); gc->DrawText (_message, 32, 32); + delete gc; return; } @@ -239,6 +254,17 @@ AudioPlot::paint () gc->SetPen (wxPen (wxColour (0, 0, 0))); gc->StrokePath (axes); + if (_cursor) { + wxGraphicsPath 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; } @@ -249,7 +275,7 @@ 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 @@ -276,7 +302,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()), - peak + linear_to_db(peak) ) ); } @@ -284,7 +310,7 @@ 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); } } @@ -345,7 +371,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()), - p + linear_to_db(p) ) ); } @@ -353,7 +379,7 @@ 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); } } @@ -379,7 +405,7 @@ AudioPlot::get_point (int channel, int point) const { AudioPoint 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; @@ -394,3 +420,59 @@ AudioPlot::colour (int n) const DCPOMATIC_ASSERT (n < int(_colours.size())); return _colours[n]; } + +void +AudioPlot::search (map const & search, wxMouseEvent const & ev, double& min_dist, Point& min_point) const +{ + for (map::const_iterator i = search.begin(); i != search.end(); ++i) { + 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; + } + } + } +} + + +void +AudioPlot::left_down () +{ + if (_cursor) { + shared_ptr fv = _viewer.lock (); + if (fv) { + 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); + + _cursor = optional (); + + 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); + GetParent()->Refresh (true, &before); + _cursor = min_point; + wxRect after (min_point.draw.x - _cursor_size / 2, min_point.draw.y - _cursor_size / 2, _cursor_size, _cursor_size); + GetParent()->Refresh (true, &after); + Cursor (min_point.time, min_point.db); + } +} + +void +AudioPlot::mouse_leave (wxMouseEvent &) +{ + _cursor = optional (); + Refresh (); + Cursor (optional(), optional()); +}