Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0

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

diff --git a/src/lib/audio_analysis.cc b/src/lib/audio_analysis.cc
index 4a710f4c1849481ca028f42cd55b116adaacdae0..73422a9be9ad8a2f3a6039d7487c284ddfe4f8bf 100644 (file)
--- a/src/lib/audio_analysis.cc
+++ b/src/lib/audio_analysis.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,15 +17,27 @@
 
 */
 
-#include <stdint.h>
-#include <cassert>
-#include <fstream>
 #include "audio_analysis.h"
+#include "cross.h"
+#include "util.h"
+#include "raw_convert.h"
+#include <libxml++/libxml++.h>
+#include <boost/filesystem.hpp>
+#include <boost/foreach.hpp>
+#include <stdint.h>
+#include <cmath>
+#include <cstdio>
+#include <iostream>
+#include <inttypes.h>
 
 using std::ostream;
+using std::istream;
 using std::string;
-using std::ofstream;
 using std::vector;
+using std::cout;
+using std::max;
+using std::list;
+using boost::shared_ptr;
 
 AudioPoint::AudioPoint ()
 {
@@ -34,36 +46,108 @@ AudioPoint::AudioPoint ()
        }
 }
 
-void
-AudioPoint::write (ostream& s) const
+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) {
-               s << _data[i] << "\n";
+               _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);
 }
 
+AudioAnalysis::AudioAnalysis (boost::filesystem::path filename)
+{
+       cxml::Document f ("AudioAnalysis");
+       f.read_file (filename);
+
+       BOOST_FOREACH (cxml::NodePtr i, f.node_children ("Channel")) {
+               vector<AudioPoint> channel;
+
+               BOOST_FOREACH (cxml::NodePtr j, i->node_children ("Point")) {
+                       channel.push_back (AudioPoint (j));
+               }
+
+               _data.push_back (channel);
+       }
+
+       _peak = f.number_child<float> ("Peak");
+       _peak_time = DCPTime (f.number_child<DCPTime::Type> ("PeakTime"));
+}
+
 void
 AudioAnalysis::add_point (int c, AudioPoint const & p)
 {
-       assert (c < int (_data.size ()));
+       DCPOMATIC_ASSERT (c < channels ());
        _data[c].push_back (p);
 }
 
+AudioPoint
+AudioAnalysis::get_point (int c, int p) const
+{
+       DCPOMATIC_ASSERT (p < points (c));
+       return _data[c][p];
+}
+
+int
+AudioAnalysis::channels () const
+{
+       return _data.size ();
+}
+
+int
+AudioAnalysis::points (int c) const
+{
+       DCPOMATIC_ASSERT (c < channels ());
+       return _data[c].size ();
+}
+
 void
-AudioAnalysis::write (string filename)
+AudioAnalysis::write (boost::filesystem::path filename)
 {
-       ofstream f (filename.c_str ());
-       f << _data.size() << "\n";
-       for (vector<vector<AudioPoint> >::iterator i = _data.begin(); i != _data.end(); ++i) {
-               f << i->size () << "\n";
-               for (vector<AudioPoint>::iterator j = i->begin(); j != i->end(); ++j) {
-                       j->write (f);
+       shared_ptr<xmlpp::Document> doc (new xmlpp::Document);
+       xmlpp::Element* root = doc->create_root_node ("AudioAnalysis");
+
+       BOOST_FOREACH (vector<AudioPoint>& i, _data) {
+               xmlpp::Element* channel = root->add_child ("Channel");
+               BOOST_FOREACH (AudioPoint& j, i) {
+                       j.as_xml (channel->add_child ("Point"));
                }
        }
+
+       if (_peak) {
+               root->add_child("Peak")->add_child_text (raw_convert<string> (_peak.get ()));
+               root->add_child("PeakTime")->add_child_text (raw_convert<string> (_peak_time.get().get ()));
+       }
+
+       doc->write_to_file_formatted (filename.string ());
 }