Also flush buffers of the inner delivery of inserts

[ardour.git] / libs / ardour / ardour / export_analysis.h

diff --git a/libs/ardour/ardour/export_analysis.h b/libs/ardour/ardour/export_analysis.h
index bab79bba4e5bc4558ede3845cee468472b0f6fb1..c911acf9f095356e7e01a9641cb6a2b6d224f44f 100644 (file)
--- 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,28 +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 (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)
                {
-                       memcpy (_peaks, other._peaks, sizeof(_peaks));
-                       memcpy (_spectrum, other._spectrum, sizeof(_spectrum));
+                       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;
-               PeakData _peaks[800];
-               float _spectrum[800][256];
+               bool have_dbtp;
+               float norm_gain_factor;
+               bool normalized;
+
+               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<framecnt_t> truepeakpos[2]; // bins with >= -1dBTB
        };
 
        typedef boost::shared_ptr<ExportAnalysis> ExportAnalysisPtr;