From a562abf85aeed64ce94a2c0c826de3fc9c21ae49 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Mon, 25 Nov 2013 01:00:26 +0000
Subject: [PATCH 1/1] Replace fstream with cstdio in audio analysis
 serialisation.

---
 src/lib/audio_analysis.cc   | 31 ++++++++++++++++---------------
 src/lib/audio_analysis.h    |  5 ++---
 test/audio_analysis_test.cc |  4 ++--
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/lib/audio_analysis.cc b/src/lib/audio_analysis.cc
index bc59bccca..1488f89fc 100644
--- a/src/lib/audio_analysis.cc
+++ b/src/lib/audio_analysis.cc
@@ -20,15 +20,14 @@
 #include <stdint.h>
 #include <cmath>
 #include <cassert>
-#include <fstream>
+#include <cstdio>
 #include <boost/filesystem.hpp>
 #include "audio_analysis.h"
+#include "cross.h"
 
 using std::ostream;
 using std::istream;
 using std::string;
-using std::ofstream;
-using std::ifstream;
 using std::vector;
 using std::cout;
 using std::max;
@@ -41,10 +40,10 @@ AudioPoint::AudioPoint ()
 	}
 }
 
-AudioPoint::AudioPoint (istream& s)
+AudioPoint::AudioPoint (FILE* f)
 {
 	for (int i = 0; i < COUNT; ++i) {
-		s >> _data[i];
+		fscanf (f, "%f", &_data[i]);
 	}
 }
 
@@ -70,10 +69,10 @@ AudioPoint::operator= (AudioPoint const & other)
 }
 
 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]);
 	}
 }
 	
@@ -85,15 +84,15 @@ AudioAnalysis::AudioAnalysis (int channels)
 
 AudioAnalysis::AudioAnalysis (boost::filesystem::path filename)
 {
-	ifstream f (filename.string().c_str ());
+	FILE* f = fopen_boost (filename, "r");
 
 	int channels;
-	f >> channels;
+	fscanf (f, "%d", &channels);
 	_data.resize (channels);
 
 	for (int i = 0; i < channels; ++i) {
 		int points;
-		f >> points;
+		fscanf (f, "%d", &points);
 		for (int j = 0; j < points; ++j) {
 			_data[i].push_back (AudioPoint (f));
 		}
@@ -130,17 +129,19 @@ AudioAnalysis::points (int c) const
 void
 AudioAnalysis::write (boost::filesystem::path filename)
 {
-	string tmp = filename.string() + ".tmp";
+	boost::filesystem::path tmp = filename;
+	tmp.replace_extension (".tmp");
 
-	ofstream f (tmp.c_str ());
-	f << _data.size() << "\n";
+	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);
 }
diff --git a/src/lib/audio_analysis.h b/src/lib/audio_analysis.h
index cfc170c84..824472dda 100644
--- a/src/lib/audio_analysis.h
+++ b/src/lib/audio_analysis.h
@@ -20,7 +20,6 @@
 #ifndef DCPOMATIC_AUDIO_ANALYSIS_H
 #define DCPOMATIC_AUDIO_ANALYSIS_H
 
-#include <iostream>
 #include <vector>
 #include <list>
 #include <boost/filesystem.hpp>
@@ -35,11 +34,11 @@ public:
 	};
 
 	AudioPoint ();
-	AudioPoint (std::istream &);
+	AudioPoint (FILE *);
 	AudioPoint (AudioPoint const &);
 	AudioPoint& operator= (AudioPoint const &);
 
-	void write (std::ostream &) const;
+	void write (FILE *) const;
 	
 	float& operator[] (int t) {
 		return _data[t];
diff --git a/test/audio_analysis_test.cc b/test/audio_analysis_test.cc
index 2ebf15fd4..77b2aeaf6 100644
--- a/test/audio_analysis_test.cc
+++ b/test/audio_analysis_test.cc
@@ -53,8 +53,8 @@ BOOST_AUTO_TEST_CASE (audio_analysis_test)
 		BOOST_CHECK (b.points(i) == points);
 		for (int j = 0; j < points; ++j) {
 			AudioPoint p = b.get_point (i, j);
-			BOOST_CHECK_CLOSE (p[AudioPoint::PEAK], random_float (), 0.1);
-			BOOST_CHECK_CLOSE (p[AudioPoint::RMS],  random_float (), 0.1);
+			BOOST_CHECK_CLOSE (p[AudioPoint::PEAK], random_float (), 1);
+			BOOST_CHECK_CLOSE (p[AudioPoint::RMS],  random_float (), 1);
 		}
 	}
 }
-- 
2.30.2