projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Do lots of the player processing with less copying.
[dcpomatic.git]
/
src
/
lib
/
audio_analysis.h
diff --git
a/src/lib/audio_analysis.h
b/src/lib/audio_analysis.h
index 6e0e2b78a8cf7a5a52f72586259eefb6eb238450..824472dda08c80daf1037a0f5635b5db7eefa556 100644
(file)
--- a/
src/lib/audio_analysis.h
+++ b/
src/lib/audio_analysis.h
@@
-17,12
+17,12
@@
*/
*/
-#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 <list>
#include <vector>
#include <list>
+#include <boost/filesystem.hpp>
class AudioPoint
{
class AudioPoint
{
@@
-34,9
+34,11
@@
public:
};
AudioPoint ();
};
AudioPoint ();
- AudioPoint (std::istream &);
+ AudioPoint (FILE *);
+ AudioPoint (AudioPoint const &);
+ AudioPoint& operator= (AudioPoint const &);
- void write (
std::ostream &
) const;
+ void write (
FILE *
) const;
float& operator[] (int t) {
return _data[t];
float& operator[] (int t) {
return _data[t];
@@
-46,11
+48,11
@@
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);
void add_point (int c, AudioPoint const & p);
@@
-58,7
+60,7
@@
public:
int points (int c) const;
int channels () 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;