projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No-op: remove all trailing whitespace.
[dcpomatic.git]
/
src
/
lib
/
audio_analysis.h
diff --git
a/src/lib/audio_analysis.h
b/src/lib/audio_analysis.h
index 824472dda08c80daf1037a0f5635b5db7eefa556..2411b4316c7f1474ff363b9e71e1baaee82ddaf6 100644
(file)
--- a/
src/lib/audio_analysis.h
+++ b/
src/lib/audio_analysis.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012
-2015
Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-23,6
+23,9
@@
#include <vector>
#include <list>
#include <boost/filesystem.hpp>
#include <vector>
#include <list>
#include <boost/filesystem.hpp>
+#include <boost/optional.hpp>
+#include <libcxml/cxml.h>
+#include "types.h"
class AudioPoint
{
class AudioPoint
{
@@
-34,12
+37,12
@@
public:
};
AudioPoint ();
};
AudioPoint ();
- AudioPoint (
FILE *
);
+ AudioPoint (
cxml::ConstNodePtr node
);
AudioPoint (AudioPoint const &);
AudioPoint& operator= (AudioPoint const &);
AudioPoint (AudioPoint const &);
AudioPoint& operator= (AudioPoint const &);
- void
write (FILE
*) const;
-
+ void
as_xml (xmlpp::Element
*) const;
+
float& operator[] (int t) {
return _data[t];
}
float& operator[] (int t) {
return _data[t];
}
@@
-55,15
+58,29
@@
public:
AudioAnalysis (boost::filesystem::path);
void add_point (int c, AudioPoint const & p);
AudioAnalysis (boost::filesystem::path);
void add_point (int c, AudioPoint const & p);
-
+ void set_peak (float peak, DCPTime time) {
+ _peak = peak;
+ _peak_time = time;
+ }
+
AudioPoint get_point (int c, int p) const;
int points (int c) const;
int channels () const;
AudioPoint get_point (int c, int p) const;
int points (int c) const;
int channels () const;
+ boost::optional<float> peak () const {
+ return _peak;
+ }
+
+ boost::optional<DCPTime> peak_time () const {
+ return _peak_time;
+ }
+
void write (boost::filesystem::path);
private:
std::vector<std::vector<AudioPoint> > _data;
void write (boost::filesystem::path);
private:
std::vector<std::vector<AudioPoint> > _data;
+ boost::optional<float> _peak;
+ boost::optional<DCPTime> _peak_time;
};
#endif
};
#endif