Merge master and multifarious hackery.

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

diff --git a/src/lib/audio_analysis.h b/src/lib/audio_analysis.h
index c2d8db8760622662a59e11541dbdfbf874aa336c..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
 {
@@ -59,7 +60,6 @@ public:
 
        void write (std::string);
 
-
 private:
        std::vector<std::vector<AudioPoint> > _data;
 };