restore demodulation of digital voice modes

csdr/chain/__init__.py

@@ -49,19 +49,31 @@ class Chain:
         self.workers[index].stop()
         self.workers[index] = newWorker
 
+        error = None
+
         if index == 0:
             if self.reader is not None:
                 newWorker.setReader(self.reader)
         else:
-            previousWorker = self.workers[index - 1]
-            self._connect(previousWorker, newWorker)
+            try:
+                previousWorker = self.workers[index - 1]
+                self._connect(previousWorker, newWorker)
+            except ValueError as e:
+                # store error for later raising, but still attempt the second connection
+                error = e
 
         if index == len(self.workers) - 1:
             if self.writer is not None:
                 newWorker.setWriter(self.writer)
         else:
-            nextWorker = self.workers[index + 1]
-            self._connect(newWorker, nextWorker)
+            try:
+                nextWorker = self.workers[index + 1]
+                self._connect(newWorker, nextWorker)
+            except ValueError as e:
+                error = e
+
+        if error is not None:
+            raise e
 
     def append(self, newWorker):
         previousWorker = None

csdr/chain/clientaudio.py

@@ -3,11 +3,9 @@ from pycsdr.modules import AudioResampler, Convert, AdpcmEncoder, Limit
 from pycsdr.types import Format
 
 
-class ClientAudioChain(Chain):
-    def __init__(self, format: Format, inputRate: int, clientRate: int, compression: str):
+class Converter(Chain):
+    def __init__(self, format: Format, inputRate: int, clientRate: int):
         workers = []
-        self.inputRate = inputRate
-        self.clientRate = clientRate
         if inputRate != clientRate:
             # we only have an audio resampler for float ATM so if we need to resample, we need to convert
             if format != Format.FLOAT:
@@ -15,20 +13,39 @@ class ClientAudioChain(Chain):
             workers += [AudioResampler(inputRate, clientRate), Limit(), Convert(Format.FLOAT, Format.SHORT)]
         elif format != Format.SHORT:
             workers += [Convert(format, Format.SHORT)]
+        super().__init__(workers)
+
+
+class ClientAudioChain(Chain):
+    def __init__(self, format: Format, inputRate: int, clientRate: int, compression: str):
+        self.format = format
+        self.inputRate = inputRate
+        self.clientRate = clientRate
+        workers = [self._buildConverter()]
         if compression == "adpcm":
             workers += [AdpcmEncoder(sync=True)]
         super().__init__(workers)
 
+    def _buildConverter(self):
+        return Converter(self.format, self.inputRate, self.clientRate)
+
     def setFormat(self, format: Format) -> None:
-        pass
+        if format == self.format:
+            return
+        self.format = format
+        self.replace(0, self._buildConverter())
 
     def setInputRate(self, inputRate: int) -> None:
         if inputRate == self.inputRate:
             return
+        self.inputRate = inputRate
+        self.replace(0, self._buildConverter())
 
     def setClientRate(self, clientRate: int) -> None:
         if clientRate == self.clientRate:
             return
+        self.clientRate = clientRate
+        self.replace(0, self._buildConverter())
 
     def setAudioCompression(self, compression: str) -> None:
         index = self.indexOf(lambda x: isinstance(x, AdpcmEncoder))