FormatConverterStream: support copy constructor

Author: pschatzmann

src/AudioTools/CoreAudio/AudioStreamsConverter.h

@@ -123,10 +123,12 @@ class ChannelFormatConverterStream : public ReformatBaseStream {
   ChannelFormatConverterStream() = default;
   ChannelFormatConverterStream(Stream &stream) { setStream(stream); }
   ChannelFormatConverterStream(Print &print) { setOutput(print); }
-  ChannelFormatConverterStream(ChannelFormatConverterStream const &) = delete;
+  ChannelFormatConverterStream(ChannelFormatConverterStream &from) { copy(from);};
   virtual ~ChannelFormatConverterStream() { end(); }
-  ChannelFormatConverterStream &operator=(
-      ChannelFormatConverterStream const &) = delete;
+  ChannelFormatConverterStream &operator=(ChannelFormatConverterStream &from) {
+    copy(from);
+    return *this;
+  }
 
   void setAudioInfo(AudioInfo cfg) override {
     TRACED();
@@ -175,8 +177,8 @@ class ChannelFormatConverterStream : public ReformatBaseStream {
 
   bool begin() override { return begin(audioInfo(), to_channels); }
 
-  void end() override { 
-    cleanupConverter(); 
+  void end() override {
+    cleanupConverter();
     is_active = false;
   }
 
@@ -257,6 +259,17 @@ class ChannelFormatConverterStream : public ReformatBaseStream {
   int from_channels = 0;
   bool is_active = false;
 
+  void copy(ChannelFormatConverterStream &from) {
+    converter = nullptr;
+    if (from.converter != nullptr) {
+      setupConverter(from.from_channels, from.to_channels);
+    }
+    bits_per_sample = from.bits_per_sample;
+    to_channels = from.to_channels;
+    from_channels = from.from_channels;
+    is_active = from.is_active;
+  };
+
   template <typename T>
   ChannelFormatConverterStreamT<T> *getConverter() {
     return (ChannelFormatConverterStreamT<T> *)converter;
@@ -779,7 +792,6 @@ class FormatConverterStream : public ReformatBaseStream {
     ReformatBaseStream::setAudioInfo(info);
     // ChannelFormatConverter -> NumberFormatConverter -> SampleRateCoverter
     channelFormatConverter.setAudioInfo(info);
-
   }
 
   void setAudioInfoOut(AudioInfo to) { to_cfg = to; }
@@ -850,13 +862,12 @@ class FormatConverterStream : public ReformatBaseStream {
   }
 
  protected:
-  AudioInfo& from_cfg = info;
+  AudioInfo &from_cfg = info;
   AudioInfo to_cfg;
   NumberFormatConverterStream numberFormatConverter;
   ChannelFormatConverterStream channelFormatConverter;
   ResampleStream sampleRateConverter;
   bool is_buffered = true;
-
 };
 
 }  // namespace audio_tools

src/AudioTools/CoreAudio/BaseStream.h

@@ -37,8 +37,8 @@ class BaseStream : public Stream {
  public:
   BaseStream() = default;
   virtual ~BaseStream() = default;
-  BaseStream(BaseStream const &) = delete;
-  BaseStream &operator=(BaseStream const &) = delete;
+  BaseStream(BaseStream &) = default;
+  BaseStream &operator=(BaseStream &) = default;
 
   virtual bool begin(){return true;}
   virtual void end(){}
@@ -123,8 +123,8 @@ class AudioStream : public BaseStream, public AudioInfoSupport, public AudioInfo
  public:
   AudioStream() = default;
   virtual ~AudioStream() = default;
-  AudioStream(AudioStream const&) = delete;
-  AudioStream& operator=(AudioStream const&) = delete;
+  AudioStream(AudioStream &) = default;
+  AudioStream& operator=(AudioStream &) = default;
 
   // Call from subclass or overwrite to do something useful
   virtual void setAudioInfo(AudioInfo newInfo) override {

src/AudioTools/CoreAudio/Buffers.h

@@ -23,8 +23,8 @@ class BaseBuffer {
  public:
   BaseBuffer() = default;
   virtual ~BaseBuffer() = default;
-  BaseBuffer(BaseBuffer const &) = delete;
-  // BaseBuffer &operator=(BaseBuffer const &) = delete;
+  BaseBuffer(BaseBuffer&) = default;
+  BaseBuffer &operator=(BaseBuffer &) = default;
 
   /// reads a single value
   virtual bool read(T &result) = 0;
@@ -181,6 +181,9 @@ class SingleBuffer : public BaseBuffer<T> {
     reset();
   }
 
+  SingleBuffer(SingleBuffer&) = default;
+  SingleBuffer& operator=(SingleBuffer&) = default;
+
   /**
    * @brief Construct a new Single Buffer w/o allocating any memory
    */