X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Faudio_buffers.h;h=63e4fac9d5089421374dcdb66033226df65c5e11;hp=8cd67aaa729d52afc42a8ff5b11f3d42327de414;hb=6ef1fc5f40567650ca9ef2b7644e4fdd97640ae6;hpb=1c13441a19aa387ddd8ac0c972207ccbbe3114d8

diff --git a/src/lib/audio_buffers.h b/src/lib/audio_buffers.h
index 8cd67aaa7..63e4fac9d 100644
--- 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>
 
-    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.
 
-    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
-    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,16 +26,22 @@
 #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
+ *  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
 {
 public:
-	AudioBuffers (int channels, int frames);
+	AudioBuffers (int channels, int32_t frames);
 	AudioBuffers (AudioBuffers const &);
-	AudioBuffers (boost::shared_ptr<const AudioBuffers>);
+	explicit AudioBuffers (boost::shared_ptr<const AudioBuffers>);
+	AudioBuffers (boost::shared_ptr<const AudioBuffers> other, int32_t frames_to_copy, int32_t read_offset);
 	~AudioBuffers ();
 
 	AudioBuffers & operator= (AudioBuffers const &);
@@ -42,12 +49,12 @@ public:
 	boost::shared_ptr<AudioBuffers> clone () const;
 	boost::shared_ptr<AudioBuffers> channel (int) const;
 
-	void ensure_size (int);
+	void ensure_size (int32_t);
 
 	float** data () const {
 		return _data;
 	}
-	
+
 	float* data (int) const;
 
 	int channels () const {
@@ -58,30 +65,32 @@ public:
 		return _frames;
 	}
 
-	void set_frames (int f);
+	void set_frames (int32_t f);
 
 	void make_silent ();
 	void make_silent (int c);
-	void make_silent (int from, int frames);
+	void make_silent (int32_t from, int32_t 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, 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 (int from, int to, int frames);
+	void move (int32_t frames, int32_t from, int32_t to);
 	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, 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, int);
+	void allocate (int channels, int32_t frames);
 	void deallocate ();
-	
+
 	/** Number of channels */
 	int _channels;
 	/** Number of frames (where a frame is one sample across all channels) */
-	int _frames;
+	int32_t _frames;
 	/** Number of frames that _data can hold */
-	int _allocated_frames;
+	int32_t _allocated_frames;
 	/** Audio data (so that, e.g. _data[2][6] is channel 2, sample 6) */
 	float** _data;
 };