X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_buffers.h;h=64ad4ba9539e5e665eb6efe61704bd0954e88e93;hb=bd83f1b0e1d8e7aae0af51376dbbb88d5e3f69d0;hp=a294ff9144944c804d805ce2f7d82f8c7efc1aa8;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git diff --git a/src/lib/audio_buffers.h b/src/lib/audio_buffers.h index a294ff914..64ad4ba95 100644 --- a/src/lib/audio_buffers.h +++ b/src/lib/audio_buffers.h @@ -32,7 +32,7 @@ * @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 @@ -40,7 +40,7 @@ class AudioBuffers public: AudioBuffers (int channels, int32_t frames); AudioBuffers (AudioBuffers const &); - AudioBuffers (boost::shared_ptr); + explicit AudioBuffers (boost::shared_ptr); ~AudioBuffers (); AudioBuffers & operator= (AudioBuffers const &); @@ -74,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 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 (boost::shared_ptr other); + void trim_start (int32_t frames); private: void allocate (int channels, int32_t frames);