/*
- Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-2020 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
*/
#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 <wx/graphics.h>
#include <boost/bind.hpp>
#include <iostream>
+#include <cfloat>
using std::cout;
using std::vector;
using boost::bind;
using boost::optional;
using boost::shared_ptr;
+using boost::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<FilmViewer> viewer)
: wxPanel (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE)
+ , _viewer (viewer)
, _smoothing (max_smoothing / 2)
, _gain_correction (0)
{
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));
}
if (!_analysis || _analysis->channels() == 0) {
gc->SetFont (gc->CreateFont (*wxNORMAL_FONT));
gc->DrawText (_message, 32, 32);
+ delete gc;
return;
}
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
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)
)
);
}
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)
)
);
}
{
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;
}
}
+
+void
+AudioPlot::left_down ()
+{
+ if (_cursor) {
+ shared_ptr<FilmViewer> fv = _viewer.lock ();
+ if (fv) {
+ fv->seek (_cursor->time, true);
+ }
+ }
+}
+
+
void
AudioPlot::mouse_moved (wxMouseEvent& ev)
{