From e1afdcec7d2f735439ee5d07b9b1330a6e292b8f Mon Sep 17 00:00:00 2001 From: B-Watch Date: Wed, 8 Jul 2020 20:33:58 +0200 Subject: [PATCH] rename startmm to getDecoderInstance --- boswatch/inputSource/inputBase.py | 2 +- boswatch/inputSource/lineInInput.py | 2 +- boswatch/inputSource/pulseaudioInput.py | 2 +- boswatch/inputSource/sdrInput.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/boswatch/inputSource/inputBase.py b/boswatch/inputSource/inputBase.py index c95269a..1c85e63 100644 --- a/boswatch/inputSource/inputBase.py +++ b/boswatch/inputSource/inputBase.py @@ -66,7 +66,7 @@ class InputBase(ABC): logging.debug("Add received data to queue") print(data) - def startmm(self, decoderConfig, StdIn): + def getDecoderInstance(self, decoderConfig, StdIn): mmProc = ProcessManager(str(decoderConfig.get("mmPath", default="multimon-ng")), textMode=True) if decoderConfig.get("fms", default=0): mmProc.addArgument("-a FMSFSK") diff --git a/boswatch/inputSource/lineInInput.py b/boswatch/inputSource/lineInInput.py index 032bb5f..5556d4c 100644 --- a/boswatch/inputSource/lineInInput.py +++ b/boswatch/inputSource/lineInInput.py @@ -40,7 +40,7 @@ class LineInInput(InputBase): lineInProc.setStderr(open(paths.LOG_PATH + "asla.log", "a")) lineInProc.start() - mmProc = self.startmm(decoderConfig, lineInProc.stdout) + mmProc = self.getDecoderInstance(decoderConfig, lineInProc.stdout) mmProc.start() logging.info("start decoding") diff --git a/boswatch/inputSource/pulseaudioInput.py b/boswatch/inputSource/pulseaudioInput.py index 8f49371..3b9b42d 100644 --- a/boswatch/inputSource/pulseaudioInput.py +++ b/boswatch/inputSource/pulseaudioInput.py @@ -39,7 +39,7 @@ class PulseAudioInput(InputBase): PulseAudioProc.setStderr(open(paths.LOG_PATH + "pulseaudio.log", "a")) PulseAudioProc.start() - mmProc = self.startmm(decoderConfig, PulseAudioProc.stdout) + mmProc = self.getDecoderInstance(decoderConfig, PulseAudioProc.stdout) mmProc.start() logging.info("start decoding") diff --git a/boswatch/inputSource/sdrInput.py b/boswatch/inputSource/sdrInput.py index 061711b..dcac725 100644 --- a/boswatch/inputSource/sdrInput.py +++ b/boswatch/inputSource/sdrInput.py @@ -41,7 +41,7 @@ class SdrInput(InputBase): sdrProc.setStderr(open(paths.LOG_PATH + "rtl_fm.log", "a")) sdrProc.start() - mmProc = self.startmm(decoderConfig, sdrProc.stdout) + mmProc = self.getDecoderInstance(decoderConfig, sdrProc.stdout) mmProc.start() logging.info("start decoding")