projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix seconds_to_approximate_hms sometimes saying things like 1h60m (#1314).
[dcpomatic.git]
/
src
/
lib
/
audio_analysis.h
diff --git
a/src/lib/audio_analysis.h
b/src/lib/audio_analysis.h
index 0a5e6194dfccf13f396cd8e02f9f1e08715ed1a3..e5ee24d49918a52e19bbcaaa6ee9c59acc6bdaa8 100644
(file)
--- a/
src/lib/audio_analysis.h
+++ b/
src/lib/audio_analysis.h
@@
-100,7
+100,7
@@
public:
_analysis_gain = gain;
}
_analysis_gain = gain;
}
-
boost::optional<int64_t>
samples_per_point () const {
+
int64_t
samples_per_point () const {
return _samples_per_point;
}
return _samples_per_point;
}
@@
-108,7
+108,7
@@
public:
_samples_per_point = spp;
}
_samples_per_point = spp;
}
-
boost::optional<int>
sample_rate () const {
+
int
sample_rate () const {
return _sample_rate;
}
return _sample_rate;
}
@@
-131,8
+131,8
@@
private:
* happened.
*/
boost::optional<double> _analysis_gain;
* happened.
*/
boost::optional<double> _analysis_gain;
-
boost::optional<int64_t>
_samples_per_point;
-
boost::optional<int>
_sample_rate;
+
int64_t
_samples_per_point;
+
int
_sample_rate;
static int const _current_state_version;
};
static int const _current_state_version;
};