projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Assorted C++11/formatting cleanups.
[dcpomatic.git]
/
src
/
lib
/
audio_analysis.h
diff --git
a/src/lib/audio_analysis.h
b/src/lib/audio_analysis.h
index 99a69edb4c26dfccccb77cd81c48e069301a436f..263e8a8a08fc1e86fd71376f6bf62b2d31df0c83 100644
(file)
--- a/
src/lib/audio_analysis.h
+++ b/
src/lib/audio_analysis.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-20
18
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-20
21
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,9
+18,11
@@
*/
*/
+
#ifndef DCPOMATIC_AUDIO_ANALYSIS_H
#define DCPOMATIC_AUDIO_ANALYSIS_H
#ifndef DCPOMATIC_AUDIO_ANALYSIS_H
#define DCPOMATIC_AUDIO_ANALYSIS_H
+
#include "dcpomatic_time.h"
#include "audio_point.h"
#include <libcxml/cxml.h>
#include "dcpomatic_time.h"
#include "audio_point.h"
#include <libcxml/cxml.h>
@@
-28,12
+30,15
@@
#include <boost/filesystem.hpp>
#include <vector>
#include <boost/filesystem.hpp>
#include <vector>
+
namespace xmlpp {
class Element;
}
namespace xmlpp {
class Element;
}
+
class Playlist;
class Playlist;
+
class AudioAnalysis : public boost::noncopyable
{
public:
class AudioAnalysis : public boost::noncopyable
{
public:
@@
-126,10
+131,10
@@
public:
void write (boost::filesystem::path);
void write (boost::filesystem::path);
- float gain_correction (
boost
::shared_ptr<const Playlist> playlist);
+ float gain_correction (
std
::shared_ptr<const Playlist> playlist);
private:
private:
- std::vector<std::vector<AudioPoint>
> _data;
+ std::vector<std::vector<AudioPoint>> _data;
std::vector<PeakTime> _sample_peak;
std::vector<float> _true_peak;
boost::optional<float> _integrated_loudness;
std::vector<PeakTime> _sample_peak;
std::vector<float> _true_peak;
boost::optional<float> _integrated_loudness;
@@
-140,10
+145,11
@@
private:
* happened.
*/
boost::optional<double> _analysis_gain;
* happened.
*/
boost::optional<double> _analysis_gain;
- int64_t _samples_per_point;
- int _sample_rate;
+ int64_t _samples_per_point
= 0
;
+ int _sample_rate
= 0
;
static int const _current_state_version;
};
static int const _current_state_version;
};
+
#endif
#endif