X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_point.cc;h=abf8485e34f3dc997753a067ae1fe741872b83ba;hb=bb10e048b22ea9ab4a53d3a5653040d9ab99fcc5;hp=45df0b3a5348f6bf624992e3ef1471f105e13d1b;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git

diff --git a/src/lib/audio_point.cc b/src/lib/audio_point.cc
index 45df0b3a5..abf8485e3 100644
--- a/src/lib/audio_point.cc
+++ b/src/lib/audio_point.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,11 +18,18 @@
 
 */
 
+
 #include "audio_point.h"
-#include "raw_convert.h"
+#include "warnings.h"
+#include <dcp/raw_convert.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+DCPOMATIC_ENABLE_WARNINGS
+
 
 using std::string;
+using dcp::raw_convert;
+
 
 AudioPoint::AudioPoint ()
 {
@@ -31,12 +38,14 @@ AudioPoint::AudioPoint ()
 	}
 }
 
+
 AudioPoint::AudioPoint (cxml::ConstNodePtr node)
 {
-	_data[PEAK] = node->number_child<float> ("Peak");
-	_data[RMS] = node->number_child<float> ("RMS");
+	_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) {
@@ -44,6 +53,7 @@ AudioPoint::AudioPoint (AudioPoint const & other)
 	}
 }
 
+
 AudioPoint &
 AudioPoint::operator= (AudioPoint const & other)
 {
@@ -58,9 +68,10 @@ AudioPoint::operator= (AudioPoint const & other)
 	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]));
+	parent->add_child("Peak")->add_child_text(raw_convert<string>(_data[PEAK]));
+	parent->add_child("RMS")->add_child_text(raw_convert<string>(_data[RMS]));
 }