2 files changed, 10 insertions, 4 deletions
diff --git a/src/lib/audio_analysis.cc b/src/lib/audio_analysis.cc
index fffafc4d4..b29ed1707 100644
--- a/src/lib/audio_analysis.cc
+++ b/src/lib/audio_analysis.cc
@@ -80,22 +80,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 ();
 }
 
diff --git a/src/lib/audio_analysis.h b/src/lib/audio_analysis.h
index c26c0584c..c2d8db876 100644
--- a/src/lib/audio_analysis.h
+++ b/src/lib/audio_analysis.h
@@ -55,6 +55,7 @@ public:
 	
 	AudioPoint get_point (int c, int p) const;
 	int points (int c) const;
+	int channels () const;
 
 	void write (std::string);