diff --git a/libs/ardour/ardour/export_analysis.h b/libs/ardour/ardour/export_analysis.h index 23568845ce..c13e61c79e 100644 --- a/libs/ardour/ardour/export_analysis.h +++ b/libs/ardour/ardour/export_analysis.h @@ -32,8 +32,10 @@ namespace ARDOUR { ExportAnalysis () : peak (0) , truepeak (0) - , loudness (0) , loudness_range (0) + , integrated_loudness (0) + , max_loudness_short (0) + , max_loudness_momentary (0) , loudness_hist_max (0) , have_loudness (false) , have_dbtp (false) @@ -50,8 +52,10 @@ namespace ARDOUR { ExportAnalysis (const ExportAnalysis& other) : peak (other.peak) , truepeak (other.truepeak) - , loudness (other.loudness) , 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_dbtp (other.have_dbtp) @@ -69,14 +73,16 @@ namespace ARDOUR { float peak; float truepeak; - float loudness; float loudness_range; - int loudness_hist[540]; - int loudness_hist_max; - bool have_loudness; - bool have_dbtp; + float integrated_loudness; + float max_loudness_short; + float max_loudness_momentary; + int loudness_hist[540]; + int loudness_hist_max; + bool have_loudness; + bool have_dbtp; float norm_gain_factor; - bool normalized; + bool normalized; uint32_t n_channels; uint32_t freq[6]; // y-pos, 50, 100, 500, 1k, 5k, 10k [Hz] diff --git a/libs/audiographer/src/general/analyser.cc b/libs/audiographer/src/general/analyser.cc index 639ab5d9ef..67951ecb44 100644 --- a/libs/audiographer/src/general/analyser.cc +++ b/libs/audiographer/src/general/analyser.cc @@ -234,7 +234,10 @@ Analyser::result () if (_ebur_plugin) { Vamp::Plugin::FeatureSet features = _ebur_plugin->getRemainingFeatures (); if (!features.empty () && features.size () == 3) { - _result.loudness = features[0][0].values[0]; + _result.integrated_loudness = features[0][0].values[0]; + _result.max_loudness_short = features[0][1].values[0]; + _result.max_loudness_momentary = features[0][2].values[0]; + _result.loudness_range = features[1][0].values[0]; assert (features[2][0].values.size () == 540); for (int i = 0; i < 540; ++i) {