X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_analysis.cc;h=597c04a222cd278ebfd95ccab5b54a2bc246c7d7;hb=4dbc6ef917aeceb906b1ef1caf6911033e7e2c54;hp=fffafc4d4c5fe38ab4591883e160e7d0e35812cc;hpb=8bfb6ae0780b0bf3318c345df78518ad3fabc9fc;p=dcpomatic.git

diff --git a/src/lib/audio_analysis.cc b/src/lib/audio_analysis.cc
index fffafc4d4..597c04a22 100644
--- a/src/lib/audio_analysis.cc
+++ b/src/lib/audio_analysis.cc
@@ -17,20 +17,23 @@
 
 */
 
+#include "audio_analysis.h"
+#include "dcpomatic_assert.h"
+#include "cross.h"
+#include <boost/filesystem.hpp>
 #include <stdint.h>
 #include <cmath>
 #include <cassert>
-#include <fstream>
-#include <boost/filesystem.hpp>
-#include "audio_analysis.h"
+#include <cstdio>
+#include <iostream>
 
 using std::ostream;
 using std::istream;
 using std::string;
-using std::ofstream;
-using std::ifstream;
 using std::vector;
 using std::cout;
+using std::max;
+using std::list;
 
 AudioPoint::AudioPoint ()
 {
@@ -39,18 +42,42 @@ AudioPoint::AudioPoint ()
 	}
 }
 
-AudioPoint::AudioPoint (istream& s)
+AudioPoint::AudioPoint (FILE* f)
+{
+	for (int i = 0; i < COUNT; ++i) {
+		int n = fscanf (f, "%f", &_data[i]);
+		if (n != 1) {
+			_data[i] = 0;
+		}
+	}
+}
+
+AudioPoint::AudioPoint (AudioPoint const & other)
 {
 	for (int i = 0; i < COUNT; ++i) {
-		s >> _data[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::write (ostream& s) const
+AudioPoint::write (FILE* f) const
 {
 	for (int i = 0; i < COUNT; ++i) {
-		s << _data[i] << "\n";
+		fprintf (f, "%f\n", _data[i]);
 	}
 }
 	
@@ -60,59 +87,77 @@ AudioAnalysis::AudioAnalysis (int channels)
 	_data.resize (channels);
 }
 
-AudioAnalysis::AudioAnalysis (string filename)
+AudioAnalysis::AudioAnalysis (boost::filesystem::path filename)
 {
-	ifstream f (filename.c_str ());
+	FILE* f = fopen_boost (filename, "r");
 
-	int channels;
-	f >> channels;
+	int channels = 0;
+	fscanf (f, "%d", &channels);
 	_data.resize (channels);
 
 	for (int i = 0; i < channels; ++i) {
 		int points;
-		f >> points;
+		fscanf (f, "%d", &points);
+		if (feof (f)) {
+			fclose (f);
+			return;
+		}
+		
 		for (int j = 0; j < points; ++j) {
 			_data[i].push_back (AudioPoint (f));
+			if (feof (f)) {
+				fclose (f);
+				return;
+			}
 		}
 	}
+
+	fclose (f);
 }
 
 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
 {
-	assert (c < int (_data.size ()));
-	assert (p < int (_data[c].size ()));
+	DCPOMATIC_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 ()));
+	DCPOMATIC_ASSERT (c < channels ());
 	return _data[c].size ();
 }
 
 void
-AudioAnalysis::write (string filename)
+AudioAnalysis::write (boost::filesystem::path filename)
 {
-	string tmp = filename + ".tmp";
-	
-	ofstream f (tmp.c_str ());
-	f << _data.size() << "\n";
+	boost::filesystem::path tmp = filename;
+	tmp.replace_extension (".tmp");
+
+	FILE* f = fopen_boost (tmp, "w");
+
+	fprintf (f, "%ld\n", _data.size ());
 	for (vector<vector<AudioPoint> >::iterator i = _data.begin(); i != _data.end(); ++i) {
-		f << i->size () << "\n";
+		fprintf (f, "%ld\n", i->size ());
 		for (vector<AudioPoint>::iterator j = i->begin(); j != i->end(); ++j) {
 			j->write (f);
 		}
 	}
 
-	f.close ();
+	fclose (f);
 	boost::filesystem::rename (tmp, filename);
 }