projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add Film::last_written_by_earlier_than()
[dcpomatic.git]
/
src
/
lib
/
audio_point.cc
diff --git
a/src/lib/audio_point.cc
b/src/lib/audio_point.cc
index 3c17234e2dbdab2da1c044d154ed4cef4e5cf9a8..1f32d25fce3e2e35bbb0ff193a37617ad1284613 100644
(file)
--- a/
src/lib/audio_point.cc
+++ b/
src/lib/audio_point.cc
@@
-1,27
+1,35
@@
/*
/*
- Copyright (C) 2012-20
15
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-20
21
Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
+
#include "audio_point.h"
#include "audio_point.h"
-#include "raw_convert.h"
+#include <dcp/raw_convert.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <libxml++/libxml++.h>
#include <libxml++/libxml++.h>
+LIBDCP_ENABLE_WARNINGS
+
using std::string;
using std::string;
+using dcp::raw_convert;
+
AudioPoint::AudioPoint ()
{
AudioPoint::AudioPoint ()
{
@@
-30,12
+38,14
@@
AudioPoint::AudioPoint ()
}
}
}
}
+
AudioPoint::AudioPoint (cxml::ConstNodePtr node)
{
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) {
AudioPoint::AudioPoint (AudioPoint const & other)
{
for (int i = 0; i < COUNT; ++i) {
@@
-43,6
+53,7
@@
AudioPoint::AudioPoint (AudioPoint const & other)
}
}
}
}
+
AudioPoint &
AudioPoint::operator= (AudioPoint const & other)
{
AudioPoint &
AudioPoint::operator= (AudioPoint const & other)
{
@@
-57,9
+68,10
@@
AudioPoint::operator= (AudioPoint const & other)
return *this;
}
return *this;
}
+
void
AudioPoint::as_xml (xmlpp::Element* parent) const
{
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]));
}
}