projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
audio_buffers.h
diff --git
a/src/lib/audio_buffers.h
b/src/lib/audio_buffers.h
index 0950f5d6775abdb15584b7af6e652aef1245a095..8cd67aaa729d52afc42a8ff5b11f3d42327de414 100644
(file)
--- a/
src/lib/audio_buffers.h
+++ b/
src/lib/audio_buffers.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-201
3
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-201
4
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
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,8
+17,12
@@
*/
*/
-#ifndef DVDOMATIC_AUDIO_BUFFERS_H
-#define DVDOMATIC_AUDIO_BUFFERS_H
+/** @file src/lib/audio_buffers.h
+ * @brief AudioBuffers class.
+ */
+
+#ifndef DCPOMATIC_AUDIO_BUFFERS_H
+#define DCPOMATIC_AUDIO_BUFFERS_H
#include <boost/shared_ptr.hpp>
#include <boost/shared_ptr.hpp>
@@
-35,6
+39,9
@@
public:
AudioBuffers & operator= (AudioBuffers const &);
AudioBuffers & operator= (AudioBuffers const &);
+ boost::shared_ptr<AudioBuffers> clone () const;
+ boost::shared_ptr<AudioBuffers> channel (int) const;
+
void ensure_size (int);
float** data () const {
void ensure_size (int);
float** data () const {
@@
-57,9
+64,12
@@
public:
void make_silent (int c);
void make_silent (int from, int frames);
void make_silent (int c);
void make_silent (int from, int frames);
+ void apply_gain (float);
+
void copy_from (AudioBuffers const * from, int frames_to_copy, int read_offset, int write_offset);
void copy_from (AudioBuffers const * from, int frames_to_copy, int read_offset, int write_offset);
+ void copy_channel_from (AudioBuffers const * from, int from_channel, int to_channel);
void move (int from, int to, int frames);
void move (int from, int to, int frames);
- void accumulate_channel (AudioBuffers const *
, int, int
);
+ void accumulate_channel (AudioBuffers const *
from, int from_channel, int to_channel, float gain = 1
);
void accumulate_frames (AudioBuffers const *, int read_offset, int write_offset, int frames);
private:
void accumulate_frames (AudioBuffers const *, int read_offset, int write_offset, int frames);
private: