/*
- Copyright (C) 2017 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2017-2021 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
*/
+
#include "compose.hpp"
#include "dkdm_wrapper.h"
#include "dcpomatic_assert.h"
#include <libxml++/libxml++.h>
DCPOMATIC_ENABLE_WARNINGS
+
using std::string;
using std::list;
using std::shared_ptr;
+using std::make_shared;
using std::dynamic_pointer_cast;
+
shared_ptr<DKDMBase>
DKDMBase::read (cxml::ConstNodePtr node)
{
if (node->name() == "DKDM") {
- return shared_ptr<DKDM> (new DKDM (dcp::EncryptedKDM (node->content ())));
+ return make_shared<DKDM>(dcp::EncryptedKDM(node->content()));
} else if (node->name() == "DKDMGroup") {
- shared_ptr<DKDMGroup> group (new DKDMGroup (node->string_attribute ("Name")));
+ auto group = make_shared<DKDMGroup>(node->string_attribute("Name"));
for (auto i: node->node_children()) {
- shared_ptr<DKDMBase> c = read (i);
- if (c) {
+ if (auto c = read(i)) {
group->add (c);
}
}
return group;
}
- return shared_ptr<DKDMBase> ();
+ return {};
}
+
string
DKDM::name () const
{
return String::compose ("%1 (%2)", _dkdm.content_title_text(), _dkdm.cpl_id());
}
+
void
DKDM::as_xml (xmlpp::Element* node) const
{
node->add_child("DKDM")->add_child_text (_dkdm.as_xml ());
}
+
void
DKDMGroup::as_xml (xmlpp::Element* node) const
{
- xmlpp::Element* f = node->add_child("DKDMGroup");
+ auto f = node->add_child("DKDMGroup");
f->set_attribute ("Name", _name);
for (auto i: _children) {
i->as_xml (f);
}
}
+
void
DKDMGroup::add (shared_ptr<DKDMBase> child, shared_ptr<DKDM> previous)
{
DCPOMATIC_ASSERT (child);
if (previous) {
- list<shared_ptr<DKDMBase> >::iterator i = find (_children.begin(), _children.end(), previous);
- if (i != _children.end ()) {
+ auto i = find (_children.begin(), _children.end(), previous);
+ if (i != _children.end()) {
++i;
}
_children.insert (i, child);
} else {
_children.push_back (child);
}
- child->set_parent (dynamic_pointer_cast<DKDMGroup> (shared_from_this ()));
+ child->set_parent (dynamic_pointer_cast<DKDMGroup>(shared_from_this()));
}
+
void
DKDMGroup::remove (shared_ptr<DKDMBase> child)
{
- for (list<shared_ptr<DKDMBase> >::iterator i = _children.begin(); i != _children.end(); ++i) {
+ for (auto i = _children.begin(); i != _children.end(); ++i) {
if (*i == child) {
_children.erase (i);
- child->set_parent (shared_ptr<DKDMGroup> ());
+ child->set_parent (shared_ptr<DKDMGroup>());
return;
}
- shared_ptr<DKDMGroup> g = dynamic_pointer_cast<DKDMGroup> (*i);
+ auto g = dynamic_pointer_cast<DKDMGroup> (*i);
if (g) {
g->remove (child);
}
*/
+
#include "audio_plot.h"
#include "wx_util.h"
#include "film_viewer.h"
#include <iostream>
#include <cfloat>
+
using std::cout;
using std::vector;
using std::list;
#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, weak_ptr<FilmViewer> viewer)
: wxPanel (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE)
, _viewer (viewer)
SetMinSize (wxSize (640, 512));
}
+
void
AudioPlot::set_analysis (shared_ptr<AudioAnalysis> a)
{
Refresh ();
}
+
void
AudioPlot::set_channel_visible (int c, bool v)
{
Refresh ();
}
+
void
AudioPlot::set_type_visible (int t, bool v)
{
Refresh ();
}
+
void
AudioPlot::set_message (wxString s)
{
Refresh ();
}
+
struct Metrics
{
double db_label_width;
float y_scale;
};
+
void
AudioPlot::paint ()
{
wxPaintDC dc (this);
- wxGraphicsContext* gc = wxGraphicsContext::Create (dc);
+ auto gc = wxGraphicsContext::Create (dc);
if (!gc) {
return;
}
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;
/* 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();
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;
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;
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);
}
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);
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
{
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
{
}
}
+
void
AudioPlot::plot_rms (wxGraphicsPath& path, int channel, Metrics const & metrics) const
{
}
}
+
void
AudioPlot::set_smoothing (int s)
{
Refresh ();
}
+
void
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] *= db_to_linear(_gain_correction);
}
return p;
}
+
/** @param n Channel index.
* @return Colour used by that channel in the plot.
*/
return _colours[n];
}
+
void
AudioPlot::search (map<int, PointList> const & search, wxMouseEvent const & ev, double& min_dist, Point& min_point) const
{
- for (map<int, PointList>::const_iterator i = search.begin(); i != search.end(); ++i) {
- for (auto const& j: i->second) {
+ for (auto const& i: search) {
+ 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;
AudioPlot::left_down ()
{
if (_cursor) {
- shared_ptr<FilmViewer> fv = _viewer.lock ();
- if (fv) {
+ if (auto fv = _viewer.lock()) {
fv->seek (_cursor->time, true);
}
}
search (_rms, ev, min_dist, min_point);
search (_peak, ev, min_dist, min_point);
- _cursor = optional<Point> ();
+ _cursor = {};
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);
}
}
+
void
AudioPlot::mouse_leave (wxMouseEvent &)
{
- _cursor = optional<Point> ();
+ _cursor = {};
Refresh ();
Cursor (optional<DCPTime>(), optional<float>());
}
projects / dcpomatic.git / commitdiff