Tidy up creation of analysis a bit.

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

diff --git a/src/lib/audio_analysis.cc b/src/lib/audio_analysis.cc
index 4a710f4c1849481ca028f42cd55b116adaacdae0..fffafc4d4c5fe38ab4591883e160e7d0e35812cc 100644 (file)
--- a/src/lib/audio_analysis.cc
+++ b/src/lib/audio_analysis.cc
@@ -18,14 +18,19 @@
 */
 
 #include <stdint.h>
+#include <cmath>
 #include <cassert>
 #include <fstream>
+#include <boost/filesystem.hpp>
 #include "audio_analysis.h"
 
 using std::ostream;
+using std::istream;
 using std::string;
 using std::ofstream;
+using std::ifstream;
 using std::vector;
+using std::cout;
 
 AudioPoint::AudioPoint ()
 {
@@ -34,6 +39,13 @@ AudioPoint::AudioPoint ()
        }
 }
 
+AudioPoint::AudioPoint (istream& s)
+{
+       for (int i = 0; i < COUNT; ++i) {
+               s >> _data[i];
+       }
+}
+
 void
 AudioPoint::write (ostream& s) const
 {
@@ -48,6 +60,23 @@ AudioAnalysis::AudioAnalysis (int channels)
        _data.resize (channels);
 }
 
+AudioAnalysis::AudioAnalysis (string filename)
+{
+       ifstream f (filename.c_str ());
+
+       int channels;
+       f >> channels;
+       _data.resize (channels);
+
+       for (int i = 0; i < channels; ++i) {
+               int points;
+               f >> points;
+               for (int j = 0; j < points; ++j) {
+                       _data[i].push_back (AudioPoint (f));
+               }
+       }
+}
+
 void
 AudioAnalysis::add_point (int c, AudioPoint const & p)
 {
@@ -55,10 +84,27 @@ AudioAnalysis::add_point (int c, AudioPoint const & p)
        _data[c].push_back (p);
 }
 
+AudioPoint
+AudioAnalysis::get_point (int c, int p) const
+{
+       assert (c < int (_data.size ()));
+       assert (p < int (_data[c].size ()));
+       return _data[c][p];
+}
+
+int
+AudioAnalysis::points (int c) const
+{
+       assert (c < int (_data.size ()));
+       return _data[c].size ();
+}
+
 void
 AudioAnalysis::write (string filename)
 {
-       ofstream f (filename.c_str ());
+       string tmp = filename + ".tmp";
+       
+       ofstream f (tmp.c_str ());
        f << _data.size() << "\n";
        for (vector<vector<AudioPoint> >::iterator i = _data.begin(); i != _data.end(); ++i) {
                f << i->size () << "\n";
@@ -66,4 +112,7 @@ AudioAnalysis::write (string filename)
                        j->write (f);
                }
        }
+
+       f.close ();
+       boost::filesystem::rename (tmp, filename);
 }