Try to fix the filter / AVFrame ownership.

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

diff --git a/src/lib/audio_analysis.cc b/src/lib/audio_analysis.cc
index 39c1ba2261a910924ed41e9024ccfc03d9b5b1e1..9d708bbfdd07f30e07327781cc328828a4ecce06 100644 (file)
--- a/src/lib/audio_analysis.cc
+++ b/src/lib/audio_analysis.cc
@@ -21,6 +21,7 @@
 #include <cmath>
 #include <cassert>
 #include <fstream>
+#include <boost/filesystem.hpp>
 #include "audio_analysis.h"
 
 using std::ostream;
@@ -30,6 +31,8 @@ using std::ofstream;
 using std::ifstream;
 using std::vector;
 using std::cout;
+using std::max;
+using std::list;
 
 AudioPoint::AudioPoint ()
 {
@@ -79,29 +82,36 @@ AudioAnalysis::AudioAnalysis (string filename)
 void
 AudioAnalysis::add_point (int c, AudioPoint const & p)
 {
-       assert (c < int (_data.size ()));
+       assert (c < channels ());
        _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 ()));
+       assert (p < points (c));
        return _data[c][p];
 }
 
+int
+AudioAnalysis::channels () const
+{
+       return _data.size ();
+}
+
 int
 AudioAnalysis::points (int c) const
 {
-       assert (c < int (_data.size ()));
+       assert (c < channels ());
        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";
@@ -109,4 +119,7 @@ AudioAnalysis::write (string filename)
                        j->write (f);
                }
        }
+
+       f.close ();
+       boost::filesystem::rename (tmp, filename);
 }