Various fixes to make audio analysis sort-of work.

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

diff --git a/src/lib/audio_analysis.h b/src/lib/audio_analysis.h
index 1c668b9c223daa54cbfc91e2bdadc93066148462..d57eba90a3184200a18619bcb0ac4b0727998038 100644 (file)
--- a/src/lib/audio_analysis.h
+++ b/src/lib/audio_analysis.h
@@ -17,11 +17,13 @@
 
 */
 
-#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>
+#include <boost/filesystem.hpp>
 
 class AudioPoint
 {
@@ -33,10 +35,11 @@ public:
        };
 
        AudioPoint ();
+       AudioPoint (std::istream &);
 
        void write (std::ostream &) const;
        
-       float& operator[] (Type t) {
+       float& operator[] (int t) {
                return _data[t];
        }
 
@@ -48,9 +51,15 @@ class AudioAnalysis
 {
 public:
        AudioAnalysis (int c);
+       AudioAnalysis (boost::filesystem::path);
 
        void add_point (int c, AudioPoint const & p);
-       void write (std::string);
+       
+       AudioPoint get_point (int c, int p) const;
+       int points (int c) const;
+       int channels () const;
+
+       void write (boost::filesystem::path);
 
 private:
        std::vector<std::vector<AudioPoint> > _data;