BOSWatch/BW3-Core
1
0
Fork 0
mirror of https://github.com/BOSWatch/BW3-Core.git synced 2025-12-06 07:12:04 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Moved setStdin to BaseClass

Browse source
This commit is contained in:
B-Watch 2020-07-08 11:55:46 +02:00
parent 35ada90130
commit ba2fab398e
4 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
boswatch/inputSource/inputBase.py
View file

@ -18,6 +18,7 @@ import time
import logging import logging
import threading import threading
from abc import ABC, abstractmethod from abc import ABC, abstractmethod
from boswatch.utils import paths
from boswatch.processManager import ProcessManager from boswatch.processManager import ProcessManager
logging.debug("- %s loaded", __name__) logging.debug("- %s loaded", __name__)
@ -65,7 +66,7 @@ class InputBase(ABC):
logging.debug("Add received data to queue") logging.debug("Add received data to queue")
print(data) print(data)
def startmm(self, decoderConfig): def startmm(self, decoderConfig, StdIn):
mmProc = ProcessManager(str(decoderConfig.get("mmPath", default="multimon-ng")), textMode=True) mmProc = ProcessManager(str(decoderConfig.get("mmPath", default="multimon-ng")), textMode=True)
if decoderConfig.get("fms", default=0): if decoderConfig.get("fms", default=0):
mmProc.addArgument("-a FMSFSK") mmProc.addArgument("-a FMSFSK")
@ -81,4 +82,6 @@ class InputBase(ABC):
mmProc.addArgument("-C " + str(decoderConfig.get("mmChar"))) mmProc.addArgument("-C " + str(decoderConfig.get("mmChar")))
mmProc.addArgument("-f alpha") mmProc.addArgument("-f alpha")
mmProc.addArgument("-t raw -") mmProc.addArgument("-t raw -")
mmProc.setStdin(StdIn)
mmProc.setStderr(open(paths.LOG_PATH + "multimon-ng.log", "a"))
return mmProc return mmProc

4
boswatch/inputSource/lineInInput.py
View file

@ -40,9 +40,7 @@ class LineInInput(InputBase):
lineInProc.setStderr(open(paths.LOG_PATH + "asla.log", "a")) lineInProc.setStderr(open(paths.LOG_PATH + "asla.log", "a"))
lineInProc.start() lineInProc.start()
mmProc = self.startmm(decoderConfig) mmProc = self.startmm(decoderConfig, lineInProc.stdout)
mmProc.setStdin(lineInProc.stdout)
mmProc.setStderr(open(paths.LOG_PATH + "multimon-ng.log", "a"))
mmProc.start() mmProc.start()
logging.info("start decoding") logging.info("start decoding")

4
boswatch/inputSource/pulseaudioInput.py
View file

@ -39,9 +39,7 @@ class PulseAudioInput(InputBase):
PulseAudioProc.setStderr(open(paths.LOG_PATH + "pulseaudio.log", "a")) PulseAudioProc.setStderr(open(paths.LOG_PATH + "pulseaudio.log", "a"))
PulseAudioProc.start() PulseAudioProc.start()
mmProc = self.startmm(decoderConfig) mmProc = self.startmm(decoderConfig, PulseAudioProc.stdout)
mmProc.setStdin(PulseAudioProc.stdout)
mmProc.setStderr(open(paths.LOG_PATH + "multimon-ng.log", "a"))
mmProc.start() mmProc.start()
logging.info("start decoding") logging.info("start decoding")

4
boswatch/inputSource/sdrInput.py
View file

@ -41,9 +41,7 @@ class SdrInput(InputBase):
sdrProc.setStderr(open(paths.LOG_PATH + "rtl_fm.log", "a")) sdrProc.setStderr(open(paths.LOG_PATH + "rtl_fm.log", "a"))
sdrProc.start() sdrProc.start()
mmProc = self.startmm(decoderConfig) mmProc = self.startmm(decoderConfig, sdrProc.stdout)
mmProc.setStdin(sdrProc.stdout)
mmProc.setStderr(open(paths.LOG_PATH + "multimon-ng.log", "a"))
mmProc.start() mmProc.start()
logging.info("start decoding") logging.info("start decoding")