ardour/livetrax
13
0
Fork 0
Code

Tweak loudness graph

Browse Source 
* plot short on top of momentary data
* limit range to 65dB
This commit is contained in:
Robin Gareus 2021-04-09 21:51:58 +02:00
parent d3d4a8664f
commit 2eaf19a10b
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
gtk2_ardour/export_analysis_graphs.cc
View File

@ -620,13 +620,13 @@ ArdourGraphs::plot_loudness (Glib::RefPtr<Pango::Context> pctx, ExportAnalysisPt
if (render_for_export) { if (render_for_export) {
v_max = ceilf ((v_max - 5.f) / 10.f) * 10.f + 5.f; v_max = ceilf ((v_max - 5.f) / 10.f) * 10.f + 5.f;
v_min = floorf ((v_min + 5.f) / 10.f) * 10.f - 5.f; v_min = floorf ((v_min + 5.f) / 10.f) * 10.f - 5.f;
v_min = std::max (v_min, v_max - 60);
} else { } else {
v_max = ceilf (v_max / 10.f) * 10.f; v_max = ceilf (v_max / 10.f) * 10.f;
v_min = floorf ((v_min + 5.f) / 10.f) * 10.f - 5.f; v_min = floorf ((v_min + 5.f) / 10.f) * 10.f - 5.f;
v_min = std::max (v_min, v_max - 65);
} }
v_min = std::max (-95.f, v_min);
std::vector<double> dashes; std::vector<double> dashes;
dashes.push_back (3.0); dashes.push_back (3.0);
dashes.push_back (5.0); dashes.push_back (5.0);
@ -797,20 +797,19 @@ ArdourGraphs::plot_loudness (Glib::RefPtr<Pango::Context> pctx, ExportAnalysisPt
} }
cr->stroke (); cr->stroke ();
/* short */ /* momentary */
cr->set_source_rgba (1, .2, .1, 1.0); cr->set_source_rgba (.1, .4, 1, 1.0);
cr->set_line_width (1.0);
first = true; first = true;
skip = 0; skip = 0;
for (size_t x = 0; x < width; ++x) { for (size_t x = 0; x < width; ++x) {
if (p->lgraph_s[x] <= v_min && first) { if (p->lgraph_m[x] <= v_min && first) {
continue; continue;
} }
float y = y0 + YPOS (p->lgraph_s[x]); float y = y0 + YPOS (p->lgraph_m[x]);
if (first) { if (first) {
yp = y;
cr->move_to (x0 + x, y); cr->move_to (x0 + x, y);
yp = y;
first = false; first = false;
} else if ((x == width - 1) || fabsf (yp - y) > 0.5) { } else if ((x == width - 1) || fabsf (yp - y) > 0.5) {
if (skip > 5 && fabsf (yp - y) > 5) { if (skip > 5 && fabsf (yp - y) > 5) {
@ -825,19 +824,20 @@ ArdourGraphs::plot_loudness (Glib::RefPtr<Pango::Context> pctx, ExportAnalysisPt
} }
cr->stroke (); cr->stroke ();
/* momentary */ /* short */
cr->set_source_rgba (.1, .4, 1, 1.0); cr->set_source_rgba (1, .2, .1, 1.0);
cr->set_line_width (1.0);
first = true; first = true;
skip = 0; skip = 0;
for (size_t x = 0; x < width; ++x) { for (size_t x = 0; x < width; ++x) {
if (p->lgraph_m[x] <= v_min && first) { if (p->lgraph_s[x] <= v_min && first) {
continue; continue;
} }
float y = y0 + YPOS (p->lgraph_m[x]); float y = y0 + YPOS (p->lgraph_s[x]);
if (first) { if (first) {
cr->move_to (x0 + x, y);
yp = y; yp = y;
cr->move_to (x0 + x, y);
first = false; first = false;
} else if ((x == width - 1) || fabsf (yp - y) > 0.5) { } else if ((x == width - 1) || fabsf (yp - y) > 0.5) {
if (skip > 5 && fabsf (yp - y) > 5) { if (skip > 5 && fabsf (yp - y) > 5) {