joachim/openwebrx-clone
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge AudioHandler and AudioChopper; split audio module

Browse Source
This commit is contained in:
Jakob Ketterl
2021-04-11 14:40:28 +02:00
parent 1f91908e06
commit 9351e4793c
7 changed files with 374 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
csdr/__init__.py
View File

@ -31,7 +31,7 @@ from functools import partial
from csdr.output import Output
from owrx.kiss import KissClient, DirewolfConfig, DirewolfConfigSubscriber
from owrx.audio.handler import AudioHandler
from owrx.audio.chopper import AudioChopper
from csdr.pipe import Pipe
@ -374,10 +374,10 @@ class Dsp(DirewolfConfigSubscriber):
self.secondary_processes_running = True
if self.isWsjtMode() or self.isJs8():
handler = AudioHandler(self, self.get_secondary_demodulator())
handler.send_output("audio", self.secondary_process_demod.stdout.read)
chopper = AudioChopper(self, self.get_secondary_demodulator())
chopper.send_output("audio", self.secondary_process_demod.stdout.read)
output_type = "js8_demod" if self.isJs8() else "wsjt_demod"
self.output.send_output(output_type, handler.read)
self.output.send_output(output_type, chopper.read)
elif self.isPacket():
# we best get the ax25 packets from the kiss socket
kiss = KissClient(self.direwolf_config.getPort())