X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_buffers.h;h=146d5bd3e2d8f88c260b3f7776d0104cd66d8c0b;hb=769d56b7f3b2fe78036b4ba12c0cfe71734b379d;hp=f4a0c1f1c052dc8b8d0e3bc78484ae1e2486ea78;hpb=67a68bd971ebe1b35daa3f75873b4ccb53c00ba0;p=dcpomatic.git diff --git a/src/lib/audio_buffers.h b/src/lib/audio_buffers.h index f4a0c1f1c..146d5bd3e 100644 --- a/src/lib/audio_buffers.h +++ b/src/lib/audio_buffers.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2014 Carl Hetherington + Copyright (C) 2012-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,15 +18,19 @@ */ + /** @file src/lib/audio_buffers.h * @brief AudioBuffers class. */ + #ifndef DCPOMATIC_AUDIO_BUFFERS_H #define DCPOMATIC_AUDIO_BUFFERS_H -#include + #include +#include + /** @class AudioBuffers * @brief A class to hold multi-channel audio data in float format. @@ -40,13 +44,14 @@ class AudioBuffers public: AudioBuffers (int channels, int32_t frames); AudioBuffers (AudioBuffers const &); - AudioBuffers (boost::shared_ptr); + explicit AudioBuffers (std::shared_ptr); + AudioBuffers (std::shared_ptr other, int32_t frames_to_copy, int32_t read_offset); ~AudioBuffers (); AudioBuffers & operator= (AudioBuffers const &); - boost::shared_ptr clone () const; - boost::shared_ptr channel (int) const; + std::shared_ptr clone () const; + std::shared_ptr channel (int) const; void ensure_size (int32_t); @@ -77,7 +82,7 @@ public: 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 * from, int32_t frames, int32_t read_offset, int32_t write_offset); - void append (boost::shared_ptr other); + void append (std::shared_ptr other); void trim_start (int32_t frames); private: @@ -94,4 +99,5 @@ private: float** _data; }; + #endif