X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Faudio_plot.cc;h=0b7b29923f45272bfb4676cff47fbd45adcce6fd;hp=3da7a50ff2c57dfe515e8a0c16c7c66d816d3dcd;hb=bcc4e2f7dc4cd5658e199ddacb7202b00ec72cf1;hpb=a2ceaa313a2b8ba28516c935f7f8b82d69957b77

diff --git a/src/wx/audio_plot.cc b/src/wx/audio_plot.cc
index 3da7a50ff..0b7b29923 100644
--- a/src/wx/audio_plot.cc
+++ b/src/wx/audio_plot.cc
@@ -267,7 +267,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
@@ -294,7 +294,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)
 				)
 			);
 	}
@@ -363,7 +363,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)
 				)
 			);
 	}
@@ -397,7 +397,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;