projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add missing file=f so that all desktop shortcuts are uninstalled.
[dcpomatic.git]
/
src
/
lib
/
audio_buffers.h
diff --git
a/src/lib/audio_buffers.h
b/src/lib/audio_buffers.h
index 51488c39a45dff7e83445f2ede7d0dbce5b1a2a5..b43179663093ea8eb549692bf841974f694f436a 100644
(file)
--- a/
src/lib/audio_buffers.h
+++ b/
src/lib/audio_buffers.h
@@
-1,30
+1,36
@@
/*
/*
- Copyright (C) 2012-20
14
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-20
21
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/>.
*/
*/
+
/** @file src/lib/audio_buffers.h
* @brief AudioBuffers class.
*/
/** @file src/lib/audio_buffers.h
* @brief AudioBuffers class.
*/
+
#ifndef DCPOMATIC_AUDIO_BUFFERS_H
#define DCPOMATIC_AUDIO_BUFFERS_H
#ifndef DCPOMATIC_AUDIO_BUFFERS_H
#define DCPOMATIC_AUDIO_BUFFERS_H
-#include <boost/shared_ptr.hpp>
+
+#include <memory>
+#include <vector>
+
/** @class AudioBuffers
* @brief A class to hold multi-channel audio data in float format.
/** @class AudioBuffers
* @brief A class to hold multi-channel audio data in float format.
@@
-34,52
+40,56
@@
class AudioBuffers
public:
AudioBuffers (int channels, int frames);
AudioBuffers (AudioBuffers const &);
public:
AudioBuffers (int channels, int frames);
AudioBuffers (AudioBuffers const &);
-
AudioBuffers (boost
::shared_ptr<const AudioBuffers>);
-
~AudioBuffers (
);
+
explicit AudioBuffers (std
::shared_ptr<const AudioBuffers>);
+
AudioBuffers (std::shared_ptr<const AudioBuffers> other, int frames_to_copy, int read_offset
);
AudioBuffers & operator= (AudioBuffers const &);
AudioBuffers & operator= (AudioBuffers const &);
- void ensure_size (int);
+ std::shared_ptr<AudioBuffers> clone () const;
+ std::shared_ptr<AudioBuffers> channel (int) const;
- float** data () const {
- return _data;
+ float*
const
* data () const {
+ return _data
_pointers.data()
;
}
}
-
- float* data (int) const;
+
+ float const* data (int) const;
+ float* data (int);
int channels () const {
int channels () const {
- return _
channels
;
+ return _
data.size()
;
}
int frames () const {
}
int frames () const {
- return _
frames
;
+ return _
data.empty() ? 0 : _data[0].size()
;
}
void set_frames (int f);
}
void set_frames (int f);
+ void set_channels(int new_channels);
+
void make_silent ();
void make_silent ();
- void make_silent (int c);
+ void make_silent (int c
hannel
);
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 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 move (int from, int to, int frames);
+ void copy_channel_from (AudioBuffers const * from, int from_channel, int to_channel);
+ void move (int frames, int from, int 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 *, int read_offset, int write_offset, int frames);
+ void accumulate_frames (AudioBuffers const * from, int frames, int read_offset, int write_offset);
+ void append (std::shared_ptr<const AudioBuffers> other);
+ void trim_start (int frames);
private:
private:
- void allocate (int, int);
- void deallocate ();
-
- /** Number of channels */
- int _channels;
- /** Number of frames (where a frame is one sample across all channels) */
- int _frames;
- /** Number of frames that _data can hold */
- int _allocated_frames;
+ void allocate (int channels, int frames);
+ void update_data_pointers ();
+
/** Audio data (so that, e.g. _data[2][6] is channel 2, sample 6) */
/** Audio data (so that, e.g. _data[2][6] is channel 2, sample 6) */
- float** _data;
+ std::vector<std::vector<float>> _data;
+ /** Pointers to the data of each vector in _data */
+ std::vector<float*> _data_pointers;
};
};
+
#endif
#endif