Merge master.

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

diff --git a/src/lib/audio_analysis.h b/src/lib/audio_analysis.h
index c26c0584c14d963004b9d55245cb39f5efc287bd..ec6905105934cf5cc78b3a48d736a98806c51001 100644 (file)
--- a/src/lib/audio_analysis.h
+++ b/src/lib/audio_analysis.h
@@ -17,11 +17,12 @@
 
 */
 
-#ifndef DVDOMATIC_AUDIO_ANALYSIS_H
-#define DVDOMATIC_AUDIO_ANALYSIS_H
+#ifndef DCPOMATIC_AUDIO_ANALYSIS_H
+#define DCPOMATIC_AUDIO_ANALYSIS_H
 
 #include <iostream>
 #include <vector>
+#include <list>
 
 class AudioPoint
 {
@@ -55,10 +56,10 @@ public:
        
        AudioPoint get_point (int c, int p) const;
        int points (int c) const;
+       int channels () const;
 
        void write (std::string);
 
-
 private:
        std::vector<std::vector<AudioPoint> > _data;
 };