use a single connection to avoid the managing overhead

owrx/audio/chopper.py

@@ -22,8 +22,7 @@ class AudioChopper(threading.Thread, Output, ProfileSourceSubscriber):
         if mode is None or not isinstance(mode, AudioChopperMode):
             raise ValueError("Mode {} is not an audio chopper mode".format(mode_str))
         self.profile_source = mode.get_profile_source()
-        self.writersChangedOut = None
-        self.writersChangedIn = None
+        (self.outputReader, self.outputWriter) = Pipe()
         super().__init__()
 
     def stop_writers(self):
@@ -34,11 +33,10 @@ class AudioChopper(threading.Thread, Output, ProfileSourceSubscriber):
         self.stop_writers()
         sorted_profiles = sorted(self.profile_source.getProfiles(), key=lambda p: p.getInterval())
         groups = {interval: list(group) for interval, group in groupby(sorted_profiles, key=lambda p: p.getInterval())}
-        writers = [AudioWriter(self.dsp, interval, profiles) for interval, profiles in groups.items()]
+        writers = [AudioWriter(self.dsp, self.outputWriter, interval, profiles) for interval, profiles in groups.items()]
         for w in writers:
             w.start()
         self.writers = writers
-        self.writersChangedOut.send(None)
 
     def supports_type(self, t):
         return t == "audio"
@@ -49,7 +47,6 @@ class AudioChopper(threading.Thread, Output, ProfileSourceSubscriber):
 
     def run(self) -> None:
         logger.debug("Audio chopper starting up")
-        self.writersChangedIn, self.writersChangedOut = Pipe()
         self.setup_writers()
         self.profile_source.subscribe(self)
         while self.doRun:
@@ -67,20 +64,25 @@ class AudioChopper(threading.Thread, Output, ProfileSourceSubscriber):
         logger.debug("Audio chopper shutting down")
         self.profile_source.unsubscribe(self)
         self.stop_writers()
-        self.writersChangedOut.close()
-        self.writersChangedIn.close()
+        self.outputWriter.close()
+        self.outputWriter = None
+
+        # drain messages left in the queue so that the queue can be successfully closed
+        # this is necessary since python keeps the file descriptors open otherwise
+        try:
+            while True:
+                self.outputReader.recv()
+        except EOFError:
+            pass
+        self.outputReader.close()
+        self.outputReader = None
 
     def onProfilesChanged(self):
         logger.debug("profile change received, resetting writers...")
         self.setup_writers()
 
     def read(self):
-        while True:
         try:
-                readers = wait([w.outputReader for w in self.writers] + [self.writersChangedIn])
-                received = [(r, r.recv()) for r in readers]
-                data = [d for r, d in received if r is not self.writersChangedIn]
-                if data:
-                    return data
+            return self.outputReader.recv()
         except (EOFError, OSError):
             return None

owrx/audio/wav.py

@@ -38,14 +38,14 @@ class WaveFile(object):
 
 
 class AudioWriter(object):
-    def __init__(self, active_dsp, interval, profiles: List[AudioChopperProfile]):
+    def __init__(self, active_dsp, outputWriter, interval, profiles: List[AudioChopperProfile]):
         self.dsp = active_dsp
+        self.outputWriter = outputWriter
         self.interval = interval
         self.profiles = profiles
         self.wavefile = None
         self.switchingLock = threading.Lock()
         self.timer = None
-        (self.outputReader, self.outputWriter) = Pipe()
 
     def getWaveFile(self):
         tmp_dir = CoreConfig().get_temporary_directory()
@@ -114,19 +114,6 @@ class AudioWriter(object):
             self.wavefile.writeframes(data)
 
     def stop(self):
-        self.outputWriter.close()
-        self.outputWriter = None
-
-        # drain messages left in the queue so that the queue can be successfully closed
-        # this is necessary since python keeps the file descriptors open otherwise
-        try:
-            while True:
-                self.outputReader.recv()
-        except EOFError:
-            pass
-        self.outputReader.close()
-        self.outputReader = None
-
         self.cancelTimer()
         try:
             self.wavefile.close()

owrx/js8.py

@@ -84,8 +84,7 @@ class Js8TurboProfile(Js8Profile):
 class Js8Parser(Parser):
     decoderRegex = re.compile(" ?<Decode(Started|Debug|Finished)>")
 
-    def parse(self, messages):
-        for raw in messages:
+    def parse(self, raw):
         try:
             profile, freq, raw_msg = raw
             self.setDialFrequency(freq)

owrx/wsjt.py

@@ -246,8 +246,7 @@ class Q65Profile(WsjtProfile):
 
 
 class WsjtParser(Parser):
-    def parse(self, messages):
-        for data in messages:
+    def parse(self, data):
         try:
             profile, freq, raw_msg = data
             self.setDialFrequency(freq)