Try to fix the filter / AVFrame ownership.

[dcpomatic.git] / src / lib / audio_analysis.cc

diff --git a/src/lib/audio_analysis.cc b/src/lib/audio_analysis.cc
index fffafc4d4c5fe38ab4591883e160e7d0e35812cc..9d708bbfdd07f30e07327781cc328828a4ecce06 100644 (file)
--- a/src/lib/audio_analysis.cc
+++ b/src/lib/audio_analysis.cc
@@ -31,6 +31,8 @@ using std::ofstream;
 using std::ifstream;
 using std::vector;
 using std::cout;
+using std::max;
+using std::list;
 
 AudioPoint::AudioPoint ()
 {
@@ -80,22 +82,27 @@ AudioAnalysis::AudioAnalysis (string filename)
 void
 AudioAnalysis::add_point (int c, AudioPoint const & p)
 {
-       assert (c < int (_data.size ()));
+       assert (c < channels ());
        _data[c].push_back (p);
 }
 
 AudioPoint
 AudioAnalysis::get_point (int c, int p) const
 {
-       assert (c < int (_data.size ()));
-       assert (p < int (_data[c].size ()));
+       assert (p < points (c));
        return _data[c][p];
 }
 
+int
+AudioAnalysis::channels () const
+{
+       return _data.size ();
+}
+
 int
 AudioAnalysis::points (int c) const
 {
-       assert (c < int (_data.size ()));
+       assert (c < channels ());
        return _data[c].size ();
 }