X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwx%2Faudio_plot.cc;h=0b7b29923f45272bfb4676cff47fbd45adcce6fd;hb=8f12e84009d7c2685bb2eeb32665876463d4e6e5;hp=cabbd206af5e0e22302e8d7decddc325bc3377c6;hpb=a423c0a0a6c891d0cacd42a3ac04c110c5f2be2e;p=dcpomatic.git

diff --git a/src/wx/audio_plot.cc b/src/wx/audio_plot.cc
index cabbd206a..0b7b29923 100644
--- a/src/wx/audio_plot.cc
+++ b/src/wx/audio_plot.cc
@@ -26,6 +26,7 @@
 #include <wx/graphics.h>
 #include <boost/bind.hpp>
 #include <iostream>
+#include <cfloat>
 
 using std::cout;
 using std::vector;
@@ -36,6 +37,7 @@ using std::map;
 using boost::bind;
 using boost::optional;
 using boost::shared_ptr;
+using namespace dcpomatic;
 
 int const AudioPlot::_minimum = -70;
 int const AudioPlot::_cursor_size = 8;
@@ -265,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
@@ -292,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)
 				)
 			);
 	}
@@ -361,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)
 				)
 			);
 	}
@@ -395,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;