projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Naming tweak.
[dcpomatic.git]
/
src
/
lib
/
audio_buffers.h
diff --git
a/src/lib/audio_buffers.h
b/src/lib/audio_buffers.h
index 122716d7765aef8b76eaba643ad9440cb74b6332..64ad4ba9539e5e665eb6efe61704bd0954e88e93 100644
(file)
--- a/
src/lib/audio_buffers.h
+++ b/
src/lib/audio_buffers.h
@@
-1,19
+1,20
@@
/*
Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
@@
-25,12
+26,13
@@
#define DCPOMATIC_AUDIO_BUFFERS_H
#include <boost/shared_ptr.hpp>
#define DCPOMATIC_AUDIO_BUFFERS_H
#include <boost/shared_ptr.hpp>
+#include <stdint.h>
/** @class AudioBuffers
* @brief A class to hold multi-channel audio data in float format.
*
* The use of int32_t for frame counts in this class is due to the
/** @class AudioBuffers
* @brief A class to hold multi-channel audio data in float format.
*
* The use of int32_t for frame counts in this class is due to the
- * round-up to the next power-of-2 code in
::ensure_size
; if that
+ * round-up to the next power-of-2 code in
ensure_size()
; if that
* were changed the frame count could use any integer type.
*/
class AudioBuffers
* were changed the frame count could use any integer type.
*/
class AudioBuffers
@@
-38,7
+40,7
@@
class AudioBuffers
public:
AudioBuffers (int channels, int32_t frames);
AudioBuffers (AudioBuffers const &);
public:
AudioBuffers (int channels, int32_t frames);
AudioBuffers (AudioBuffers const &);
- AudioBuffers (boost::shared_ptr<const AudioBuffers>);
+
explicit
AudioBuffers (boost::shared_ptr<const AudioBuffers>);
~AudioBuffers ();
AudioBuffers & operator= (AudioBuffers const &);
~AudioBuffers ();
AudioBuffers & operator= (AudioBuffers const &);
@@
-72,9
+74,11
@@
public:
void copy_from (AudioBuffers const * from, int32_t frames_to_copy, int32_t read_offset, int32_t write_offset);
void copy_channel_from (AudioBuffers const * from, int from_channel, int to_channel);
void copy_from (AudioBuffers const * from, int32_t frames_to_copy, int32_t read_offset, int32_t write_offset);
void copy_channel_from (AudioBuffers const * from, int from_channel, int to_channel);
- void move (int32_t fr
om, int32_t to, int32_t frames
);
+ void move (int32_t fr
ames, int32_t from, int32_t to
);
void accumulate_channel (AudioBuffers const * from, int from_channel, int to_channel, float gain = 1);
void accumulate_channel (AudioBuffers const * from, int from_channel, int to_channel, float gain = 1);
- void accumulate_frames (AudioBuffers const *, int32_t read_offset, int32_t write_offset, int32_t frames);
+ void accumulate_frames (AudioBuffers const * from, int32_t frames, int32_t read_offset, int32_t write_offset);
+ void append (boost::shared_ptr<const AudioBuffers> other);
+ void trim_start (int32_t frames);
private:
void allocate (int channels, int32_t frames);
private:
void allocate (int channels, int32_t frames);