projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Try to fix windows build.
[dcpomatic.git]
/
src
/
lib
/
audio_analysis.h
diff --git
a/src/lib/audio_analysis.h
b/src/lib/audio_analysis.h
index c26c0584c14d963004b9d55245cb39f5efc287bd..cfc170c846ae2af87e12645e3dd84e4ba7e9c13a 100644
(file)
--- a/
src/lib/audio_analysis.h
+++ b/
src/lib/audio_analysis.h
@@
-17,11
+17,13
@@
*/
*/
-#ifndef D
VD
OMATIC_AUDIO_ANALYSIS_H
-#define D
VD
OMATIC_AUDIO_ANALYSIS_H
+#ifndef D
CP
OMATIC_AUDIO_ANALYSIS_H
+#define D
CP
OMATIC_AUDIO_ANALYSIS_H
#include <iostream>
#include <vector>
#include <iostream>
#include <vector>
+#include <list>
+#include <boost/filesystem.hpp>
class AudioPoint
{
class AudioPoint
{
@@
-34,6
+36,8
@@
public:
AudioPoint ();
AudioPoint (std::istream &);
AudioPoint ();
AudioPoint (std::istream &);
+ AudioPoint (AudioPoint const &);
+ AudioPoint& operator= (AudioPoint const &);
void write (std::ostream &) const;
void write (std::ostream &) const;
@@
-45,19
+49,19
@@
private:
float _data[COUNT];
};
float _data[COUNT];
};
-class AudioAnalysis
+class AudioAnalysis
: public boost::noncopyable
{
public:
AudioAnalysis (int c);
{
public:
AudioAnalysis (int c);
- AudioAnalysis (
std::string
);
+ AudioAnalysis (
boost::filesystem::path
);
void add_point (int c, AudioPoint const & p);
AudioPoint get_point (int c, int p) const;
int points (int c) const;
void add_point (int c, AudioPoint const & p);
AudioPoint get_point (int c, int p) const;
int points (int c) const;
+ int channels () const;
- void write (std::string);
-
+ void write (boost::filesystem::path);
private:
std::vector<std::vector<AudioPoint> > _data;
private:
std::vector<std::vector<AudioPoint> > _data;