X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fexport_analysis.h;h=5930784ba2e081b0dfad3f5b6d10b36426cf113c;hb=e4d3ebfb666e2c4e9cf134d8f3ed42152da343bf;hp=360294ce071b054643eebe3c1c09f9443608a6e5;hpb=e41296bf5d8ac95566e9bedd5599c7f8d74e2ed2;p=ardour.git

diff --git a/libs/ardour/ardour/export_analysis.h b/libs/ardour/ardour/export_analysis.h
index 360294ce07..5930784ba2 100644
--- a/libs/ardour/ardour/export_analysis.h
+++ b/libs/ardour/ardour/export_analysis.h
@@ -20,6 +20,7 @@
 #define __ardour_export_analysis_h__
 
 #include <map>
+#include <set>
 #include <cstring>
 #include <boost/shared_ptr.hpp>
 
@@ -29,35 +30,60 @@ namespace ARDOUR {
 	struct ExportAnalysis {
 	public:
 		ExportAnalysis ()
-			: loudness (0)
+			: peak (0)
+			, truepeak (0)
+			, loudness (0)
 			, loudness_range (0)
 			, loudness_hist_max (0)
 			, have_loudness (false)
+			, have_dbtp (false)
+			, norm_gain_factor (1.0)
+			, normalized (false)
+			, n_channels (1)
 		{
 			memset (peaks, 0, sizeof(peaks));
 			memset (spectrum, 0, sizeof(spectrum));
 			memset (loudness_hist, 0, sizeof(loudness_hist));
+			memset (freq, 0, sizeof(freq));
 		}
 
 		ExportAnalysis (const ExportAnalysis& other)
-			: loudness (other.loudness)
+			: peak (other.peak)
+			, truepeak (other.truepeak)
+			, loudness (other.loudness)
 			, loudness_range (other.loudness_range)
 			, loudness_hist_max (other.loudness_hist_max)
 			, have_loudness (other.have_loudness)
+			, have_dbtp (other.have_dbtp)
+			, norm_gain_factor (other.norm_gain_factor)
+			, normalized (other.normalized)
+			, n_channels (other.n_channels)
 		{
+			truepeakpos[0] = other.truepeakpos[0];
+			truepeakpos[1] = other.truepeakpos[1];
 			memcpy (peaks, other.peaks, sizeof(peaks));
 			memcpy (spectrum, other.spectrum, sizeof(spectrum));
 			memcpy (loudness_hist, other.loudness_hist, sizeof(loudness_hist));
+			memcpy (freq, other.freq, sizeof(freq));
 		}
 
+		float peak;
+		float truepeak;
 		float loudness;
 		float loudness_range;
 		int loudness_hist[540];
 		int loudness_hist_max;
 		bool have_loudness;
+		bool have_dbtp;
+		float norm_gain_factor;
+		bool normalized;
 
-		PeakData peaks[800];
+		uint32_t n_channels;
+		uint32_t freq[6]; // y-pos, 50, 100, 500, 1k, 5k, 10k [Hz]
+
+		PeakData peaks[2][800];
 		float spectrum[800][200];
+		std::set<samplecnt_t> truepeakpos[2]; // bins with >= -1dBTB
 	};
 
 	typedef boost::shared_ptr<ExportAnalysis> ExportAnalysisPtr;