put the socketclient on the source so it can be shared

csdr/chain/__init__.py

@@ -12,5 +12,8 @@ class Chain(object):
         for w in self.workers:
             w.stop()
 
+    def setInput(self, buffer):
+        self.workers[0].setInput(buffer)
+
     def getBuffer(self):
         return self.buffer

csdr/chain/fft.py

@@ -1,11 +1,10 @@
 from csdr.chain import Chain
-from pycsdr import SocketClient, Fft, LogAveragePower, FftExchangeSides, CompressFftAdpcm
+from pycsdr import Fft, LogAveragePower, FftExchangeSides, CompressFftAdpcm
 
 
 class FftChain(Chain):
-    def __init__(self, port, fft_size, fft_block_size, fft_averages, fft_compression):
+    def __init__(self, fft_size, fft_block_size, fft_averages, fft_compression):
         workers = [
-            SocketClient(port=port),
             Fft(size=fft_size, every_n_samples=int(fft_block_size)),
             LogAveragePower(add_db=-70, fft_size=fft_size, avg_number=fft_averages),
             FftExchangeSides(fft_size=fft_size),

csdr/csdr.py

@@ -77,6 +77,7 @@ class dsp(object):
     def __init__(self, output):
         self.pycsdr_enabled = True
         self.pycsdr_chain = None
+        self.socketClient = None
 
         self.samp_rate = 250000
         self.output_rate = 11025
@@ -137,6 +138,11 @@ class dsp(object):
         self.direwolf_port = None
         self.process = None
 
+    def setSocketClient(self, socketClient):
+        self.socketClient = socketClient
+        if self.pycsdr_chain is not None:
+            self.pycsdr_chain.setInput(socketClient.getBuffer())
+
     def set_service(self, flag=True):
         self.is_service = flag
 
@@ -766,13 +772,15 @@ class dsp(object):
                     self.running = True
 
                 self.pycsdr_chain = FftChain(
-                    port=self.nc_port,
                     fft_size=self.fft_size,
                     fft_block_size=self.fft_block_size(),
                     fft_averages=self.fft_averages,
                     fft_compression=self.fft_compression
                 )
 
+                if self.socketClient is not None:
+                    self.pycsdr_chain.setInput(self.socketClient.getBuffer())
+
                 self.output.send_output("audio", self.pycsdr_chain.getBuffer().read)
 
                 return