InputMixer

Author: pschatzmann

src/AudioTools/CoreAudio/AudioStreams.h

@@ -1174,11 +1174,7 @@ class InputMixer : public AudioStream {
   void setWeight(int channel, int weight) {
     if (channel < size()) {
       weights[channel] = weight;
-      int total = 0;
-      for (int j = 0; j < weights.size(); j++) {
-        total += weights[j];
-      }
-      total_weights = total;
+      recalculateWeights();
     } else {
       LOGE("Invalid channel %d - max is %d", channel, size() - 1);
     }
@@ -1233,14 +1229,30 @@ class InputMixer : public AudioStream {
       return false;
     }
     streams.erase(idx);
+    weights.erase(idx);
+    recalculateWeights();
     return true;
   }
 
+  /// Removes all streams which have no data available
+  bool remove() {
+    bool rc = false;
+    int idx = nextEmptyIndex();
+    while (idx >= 0) {
+      rc = true;
+      streams.erase(idx);
+      weights.erase(idx);
+      idx = nextEmptyIndex();
+    }
+    recalculateWeights();
+    return rc;
+  }
+
   /// Provides the actual index of the stream
   int indexOf(Stream &stream) { return streams.indexOf(&stream); }
 
   /// Provides the stream pointer at the indicated index
-  Stream * operator [](int idx) {
+  Stream *operator[](int idx) {
     if (idx < 0 || idx >= size()) return nullptr;
     return streams[idx];
   }
@@ -1265,6 +1277,15 @@ class InputMixer : public AudioStream {
   Vector<int> result_vect;
   Vector<T> current_vect;
 
+  /// Recalculate the weights
+  void recalculateWeights() {
+      int total = 0;
+      for (int j = 0; j < weights.size(); j++) {
+        total += weights[j];
+      }
+      total_weights = total;
+  }
+
   /// mixing using a vector of samples
   int readBytesVector(T *p_data, int byteCount) {
     int samples = byteCount / sizeof(T);
@@ -1475,8 +1496,8 @@ class CallbackStream : public ModifyingStream {
   /// defines the callback to receive the actual audio info
   void setAudioInfoCallback(void (*cb)(AudioInfo info)) {
     this->cb_audio_info = cb;
-  } 
-  
+  }
+
   /// Updates the audio info and calls the callback
   void setAudioInfo(AudioInfo info) override {
     ModifyingStream::setAudioInfo(info);
@@ -1714,9 +1735,9 @@ class VolumeMeter : public ModifyingStream {
     return begin();
   }
 
-  bool begin() override { 
+  bool begin() override {
     setAudioInfo(audioInfo());
-    return true; 
+    return true;
   }
 
   void setAudioInfo(AudioInfo info) override {