11b5bf6229b8713dffde89a777cd5181335136f6 from master; default colour conversions...

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

diff --git a/src/lib/audio_analysis.h b/src/lib/audio_analysis.h
index c26c0584c14d963004b9d55245cb39f5efc287bd..9387ec896b67b92f072a3d31b0509a4373dc03e3 100644 (file)
--- a/src/lib/audio_analysis.h
+++ b/src/lib/audio_analysis.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,11 +17,15 @@
 
 */
 
-#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>
+#include <boost/optional.hpp>
+#include <libcxml/cxml.h>
+#include "types.h"
 
 class AudioPoint
 {
@@ -33,9 +37,11 @@ public:
        };
 
        AudioPoint ();
-       AudioPoint (std::istream &);
+       AudioPoint (cxml::ConstNodePtr node);
+       AudioPoint (AudioPoint const &);
+       AudioPoint& operator= (AudioPoint const &);
 
-       void write (std::ostream &) const;
+       void as_xml (xmlpp::Element *) const;
        
        float& operator[] (int t) {
                return _data[t];
@@ -45,22 +51,36 @@ private:
        float _data[COUNT];
 };
 
-class AudioAnalysis
+class AudioAnalysis : public boost::noncopyable
 {
 public:
        AudioAnalysis (int c);
-       AudioAnalysis (std::string);
+       AudioAnalysis (boost::filesystem::path);
 
        void add_point (int c, AudioPoint const & p);
+       void set_peak (float peak, DCPTime time) {
+               _peak = peak;
+               _peak_time = time;
+       }
        
        AudioPoint get_point (int c, int p) const;
        int points (int c) const;
+       int channels () const;
+
+       boost::optional<float> peak () const {
+               return _peak;
+       }
 
-       void write (std::string);
+       boost::optional<DCPTime> peak_time () const {
+               return _peak_time;
+       }
 
+       void write (boost::filesystem::path);
 
 private:
        std::vector<std::vector<AudioPoint> > _data;
+       boost::optional<float> _peak;
+       boost::optional<DCPTime> _peak_time;
 };
 
 #endif