X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Faudio_buffers.h;h=146d5bd3e2d8f88c260b3f7776d0104cd66d8c0b;hp=122716d7765aef8b76eaba643ad9440cb74b6332;hb=ac34066d5e448d1984d11a180be74e31b6e13b5c;hpb=d22e839b94af048bdeaba61e427bcd2f07b4a3ee

diff --git a/src/lib/audio_buffers.h b/src/lib/audio_buffers.h
index 122716d77..146d5bd3e 100644
--- a/src/lib/audio_buffers.h
+++ b/src/lib/audio_buffers.h
@@ -1,36 +1,42 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 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/>.
 
 */
 
+
 /** @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 <stdint.h>
+#include <memory>
+
 
 /** @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
@@ -38,13 +44,14 @@ class AudioBuffers
 public:
 	AudioBuffers (int channels, int32_t frames);
 	AudioBuffers (AudioBuffers const &);
-	AudioBuffers (boost::shared_ptr<const AudioBuffers>);
+	explicit AudioBuffers (std::shared_ptr<const AudioBuffers>);
+	AudioBuffers (std::shared_ptr<const AudioBuffers> other, int32_t frames_to_copy, int32_t read_offset);
 	~AudioBuffers ();
 
 	AudioBuffers & operator= (AudioBuffers const &);
 
-	boost::shared_ptr<AudioBuffers> clone () const;
-	boost::shared_ptr<AudioBuffers> channel (int) const;
+	std::shared_ptr<AudioBuffers> clone () const;
+	std::shared_ptr<AudioBuffers> channel (int) const;
 
 	void ensure_size (int32_t);
 
@@ -72,9 +79,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 move (int32_t from, int32_t to, int32_t 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 *, 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 (std::shared_ptr<const AudioBuffers> other);
+	void trim_start (int32_t frames);
 
 private:
 	void allocate (int channels, int32_t frames);
@@ -90,4 +99,5 @@ private:
 	float** _data;
 };
 
+
 #endif