Logging improvements to allow prettier displays in the server GUI.

[dcpomatic.git] / src / lib / audio_analysis.cc

diff --git a/src/lib/audio_analysis.cc b/src/lib/audio_analysis.cc
index 73422a9be9ad8a2f3a6039d7487c284ddfe4f8bf..10e02232292c30f9dbf17975f49a8c0e88d388d4 100644 (file)
--- a/src/lib/audio_analysis.cc
+++ b/src/lib/audio_analysis.cc
@@ -21,6 +21,8 @@
 #include "cross.h"
 #include "util.h"
 #include "raw_convert.h"
+#include "playlist.h"
+#include "audio_content.h"
 #include <libxml++/libxml++.h>
 #include <boost/filesystem.hpp>
 #include <boost/foreach.hpp>
@@ -38,48 +40,8 @@ using std::cout;
 using std::max;
 using std::list;
 using boost::shared_ptr;
+using boost::dynamic_pointer_cast;
 
-AudioPoint::AudioPoint ()
-{
-       for (int i = 0; i < COUNT; ++i) {
-               _data[i] = 0;
-       }
-}
-
-AudioPoint::AudioPoint (cxml::ConstNodePtr node)
-{
-       _data[PEAK] = node->number_child<float> ("Peak");
-       _data[RMS] = node->number_child<float> ("RMS");
-}
-
-AudioPoint::AudioPoint (AudioPoint const & other)
-{
-       for (int i = 0; i < COUNT; ++i) {
-               _data[i] = other._data[i];
-       }
-}
-
-AudioPoint &
-AudioPoint::operator= (AudioPoint const & other)
-{
-       if (this == &other) {
-               return *this;
-       }
-       
-       for (int i = 0; i < COUNT; ++i) {
-               _data[i] = other._data[i];
-       }
-
-       return *this;
-}
-
-void
-AudioPoint::as_xml (xmlpp::Element* parent) const
-{
-       parent->add_child ("Peak")->add_child_text (raw_convert<string> (_data[PEAK]));
-       parent->add_child ("RMS")->add_child_text (raw_convert<string> (_data[RMS]));
-}
-       
 AudioAnalysis::AudioAnalysis (int channels)
 {
        _data.resize (channels);
@@ -102,6 +64,7 @@ AudioAnalysis::AudioAnalysis (boost::filesystem::path filename)
 
        _peak = f.number_child<float> ("Peak");
        _peak_time = DCPTime (f.number_child<DCPTime::Type> ("PeakTime"));
+       _analysis_gain = f.optional_number_child<double> ("AnalysisGain");
 }
 
 void
@@ -149,5 +112,25 @@ AudioAnalysis::write (boost::filesystem::path filename)
                root->add_child("PeakTime")->add_child_text (raw_convert<string> (_peak_time.get().get ()));
        }
 
+       if (_analysis_gain) {
+               root->add_child("AnalysisGain")->add_child_text (raw_convert<string> (_analysis_gain.get ()));
+       }
+
        doc->write_to_file_formatted (filename.string ());
 }
+
+float
+AudioAnalysis::gain_correction (shared_ptr<const Playlist> playlist)
+{
+       if (playlist->content().size() == 1 && analysis_gain ()) {
+               /* In this case we know that the analysis was of a single piece of content and
+                  we know that content's gain when the analysis was run.  Hence we can work out
+                  what correction is now needed to make it look `right'.
+               */
+               shared_ptr<const AudioContent> ac = dynamic_pointer_cast<const AudioContent> (playlist->content().front ());
+               DCPOMATIC_ASSERT (ac);
+               return ac->audio_gain() - analysis_gain().get ();
+       }
+
+       return 0.0f;
+}