diff --git a/libs/ardour/ardour/export_analysis.h b/libs/ardour/ardour/export_analysis.h
index 948a527a0a..9bebf53cd6 100644
--- a/libs/ardour/ardour/export_analysis.h
+++ b/libs/ardour/ardour/export_analysis.h
@@ -19,134 +19,135 @@
 #ifndef __ardour_export_analysis_h__
 #define __ardour_export_analysis_h__
 
+#include <cstring>
 #include <map>
 #include <set>
 #include <vector>
-#include <cstring>
 
 #include <boost/shared_ptr.hpp>
 
 #include "ardour/types.h"
 
-namespace ARDOUR {
-	struct ExportAnalysis {
-	public:
-		ExportAnalysis (size_t w = 800, size_t b = 200)
-			: width (w)
-			, peak (0)
-			, truepeak (0)
-			, loudness_range (0)
-			, integrated_loudness (0)
-			, max_loudness_short (0)
-			, max_loudness_momentary (0)
-			, loudness_hist_max (0)
-			, have_loudness (false)
-			, have_lufs_graph (false)
-			, have_dbtp (false)
-			, norm_gain_factor (1.0)
-			, normalized (false)
-			, n_channels (1)
-			, n_samples (0)
-		{
-			b = std::max<size_t> (100, b);
-			width = std::max<size_t> (800, width);
+namespace ARDOUR
+{
+struct ExportAnalysis {
+public:
+	ExportAnalysis (size_t w = 800, size_t b = 200)
+		: width (w)
+		, peak (0)
+		, truepeak (0)
+		, loudness_range (0)
+		, integrated_loudness (0)
+		, max_loudness_short (0)
+		, max_loudness_momentary (0)
+		, loudness_hist_max (0)
+		, have_loudness (false)
+		, have_lufs_graph (false)
+		, have_dbtp (false)
+		, norm_gain_factor (1.0)
+		, normalized (false)
+		, n_channels (1)
+		, n_samples (0)
+	{
+		b     = std::max<size_t> (100, b);
+		width = std::max<size_t> (800, width);
 
-			peaks[0].resize (w);
-			peaks[1].resize (width);
-			spectrum.resize (width);
+		peaks[0].resize (w);
+		peaks[1].resize (width);
+		spectrum.resize (width);
 
-			for (size_t i = 0; i < width; ++i) {
-				spectrum[i].resize (b);
-			}
-
-			lgraph_i   = new float [width]();
-			lgraph_s   = new float [width]();
-			lgraph_m   = new float [width]();
-			limiter_pk = new float [width]();
-
-			for (size_t i = 0; i < width; ++i) {
-				/* d compare to ebu_r128_proc.cc */
-				lgraph_i [i] = -200;
-				lgraph_s [i] = -200;
-				lgraph_m [i] = -200;
-			}
+		for (size_t i = 0; i < width; ++i) {
+			spectrum[i].resize (b);
 		}
 
-		ExportAnalysis (const ExportAnalysis& other)
-			: width (other.width)
-			, peak (other.peak)
-			, truepeak (other.truepeak)
-			, loudness_range (other.loudness_range)
-			, integrated_loudness (other.integrated_loudness)
-			, max_loudness_short (other.max_loudness_short)
-			, max_loudness_momentary (other.max_loudness_momentary)
-			, loudness_hist_max (other.loudness_hist_max)
-			, have_loudness (other.have_loudness)
-			, have_lufs_graph (other.have_lufs_graph)
-			, have_dbtp (other.have_dbtp)
-			, norm_gain_factor (other.norm_gain_factor)
-			, normalized (other.normalized)
-			, n_channels (other.n_channels)
-			, n_samples (other.n_samples)
-			, peaks (other.peaks)
-			, spectrum (other.spectrum)
-		{
-			lgraph_i   = new float [width];
-			lgraph_s   = new float [width];
-			lgraph_m   = new float [width];
-			limiter_pk = new float [width]();
+		lgraph_i   = new float[width]();
+		lgraph_s   = new float[width]();
+		lgraph_m   = new float[width]();
+		limiter_pk = new float[width]();
 
-			truepeakpos[0] = other.truepeakpos[0];
-			truepeakpos[1] = other.truepeakpos[1];
-
-			memcpy (loudness_hist, other.loudness_hist, sizeof(float) * width);
-			memcpy (lgraph_i, other.lgraph_i, sizeof(float) * width);
-			memcpy (lgraph_s, other.lgraph_s, sizeof(float) * width);
-			memcpy (lgraph_m, other.lgraph_m, sizeof(float) * width);
-			memcpy (limiter_pk, other.limiter_pk, sizeof(float) * width);
-			memcpy (freq, other.freq, sizeof(freq));
+		for (size_t i = 0; i < width; ++i) {
+			/* d compare to ebu_r128_proc.cc */
+			lgraph_i[i] = -200;
+			lgraph_s[i] = -200;
+			lgraph_m[i] = -200;
 		}
+	}
 
-		~ExportAnalysis ()
-		{
-			delete [] lgraph_i;
-			delete [] lgraph_s;
-			delete [] lgraph_m;
-			delete [] limiter_pk;
-		}
+	ExportAnalysis (const ExportAnalysis& other)
+		: width (other.width)
+		, peak (other.peak)
+		, truepeak (other.truepeak)
+		, loudness_range (other.loudness_range)
+		, integrated_loudness (other.integrated_loudness)
+		, max_loudness_short (other.max_loudness_short)
+		, max_loudness_momentary (other.max_loudness_momentary)
+		, loudness_hist_max (other.loudness_hist_max)
+		, have_loudness (other.have_loudness)
+		, have_lufs_graph (other.have_lufs_graph)
+		, have_dbtp (other.have_dbtp)
+		, norm_gain_factor (other.norm_gain_factor)
+		, normalized (other.normalized)
+		, n_channels (other.n_channels)
+		, n_samples (other.n_samples)
+		, peaks (other.peaks)
+		, spectrum (other.spectrum)
+	{
+		lgraph_i   = new float[width];
+		lgraph_s   = new float[width];
+		lgraph_m   = new float[width];
+		limiter_pk = new float[width]();
 
-		size_t width;
-		float  peak;
-		float  truepeak;
-		float  loudness_range;
-		float  integrated_loudness;
-		float  max_loudness_short;
-		float  max_loudness_momentary;
-		int    loudness_hist[540];
-		int    loudness_hist_max;
-		bool   have_loudness;
-		bool   have_lufs_graph;
-		bool   have_dbtp;
-		float  norm_gain_factor;
-		bool   normalized;
+		truepeakpos[0] = other.truepeakpos[0];
+		truepeakpos[1] = other.truepeakpos[1];
 
-		uint32_t n_channels;
-		uint32_t n_samples;
-		uint32_t freq[6]; // y-pos, 50, 100, 500, 1k, 5k, 10k [Hz]
+		memcpy (loudness_hist, other.loudness_hist, sizeof (float) * width);
+		memcpy (lgraph_i, other.lgraph_i, sizeof (float) * width);
+		memcpy (lgraph_s, other.lgraph_s, sizeof (float) * width);
+		memcpy (lgraph_m, other.lgraph_m, sizeof (float) * width);
+		memcpy (limiter_pk, other.limiter_pk, sizeof (float) * width);
+		memcpy (freq, other.freq, sizeof (freq));
+	}
 
-		std::vector<PeakData>            peaks[2];
-		std::vector<std::vector<float> > spectrum;
+	~ExportAnalysis ()
+	{
+		delete[] lgraph_i;
+		delete[] lgraph_s;
+		delete[] lgraph_m;
+		delete[] limiter_pk;
+	}
 
-		float* lgraph_i; //[800];
-		float* lgraph_s; //[800];
-		float* lgraph_m; //[800];
-		float* limiter_pk; //[800];
+	size_t width;
+	float  peak;
+	float  truepeak;
+	float  loudness_range;
+	float  integrated_loudness;
+	float  max_loudness_short;
+	float  max_loudness_momentary;
+	int    loudness_hist[540];
+	int    loudness_hist_max;
+	bool   have_loudness;
+	bool   have_lufs_graph;
+	bool   have_dbtp;
+	float  norm_gain_factor;
+	bool   normalized;
 
-		std::set<samplecnt_t> truepeakpos[2]; // bins with >= -1dBTB
-	};
+	uint32_t n_channels;
+	uint32_t n_samples;
+	uint32_t freq[6]; // y-pos, 50, 100, 500, 1k, 5k, 10k [Hz]
 
-	typedef boost::shared_ptr<ExportAnalysis> ExportAnalysisPtr;
-	typedef std::map<std::string, ExportAnalysisPtr> AnalysisResults;
+	std::vector<PeakData>           peaks[2];
+	std::vector<std::vector<float>> spectrum;
+
+	float* lgraph_i;
+	float* lgraph_s;
+	float* lgraph_m;
+	float* limiter_pk;
+
+	std::set<samplecnt_t> truepeakpos[2]; // bins with >= -1dBTB
+};
+
+typedef boost::shared_ptr<ExportAnalysis>        ExportAnalysisPtr;
+typedef std::map<std::string, ExportAnalysisPtr> AnalysisResults;
 
 } // namespace ARDOUR
 #endif