From ba2fab398ef35e9464a0258cf59e9c2301d5011e Mon Sep 17 00:00:00 2001
From: B-Watch <b-watch@forceweb.de>
Date: Wed, 8 Jul 2020 11:55:46 +0200
Subject: [PATCH] Moved setStdin to BaseClass

---
 boswatch/inputSource/inputBase.py       | 5 ++++-
 boswatch/inputSource/lineInInput.py     | 4 +---
 boswatch/inputSource/pulseaudioInput.py | 4 +---
 boswatch/inputSource/sdrInput.py        | 4 +---
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/boswatch/inputSource/inputBase.py b/boswatch/inputSource/inputBase.py
index 8b62535..c95269a 100644
--- a/boswatch/inputSource/inputBase.py
+++ b/boswatch/inputSource/inputBase.py
@@ -18,6 +18,7 @@ import time
 import logging
 import threading
 from abc import ABC, abstractmethod
+from boswatch.utils import paths
 from boswatch.processManager import ProcessManager
 
 logging.debug("- %s loaded", __name__)
@@ -65,7 +66,7 @@ class InputBase(ABC):
         logging.debug("Add received data to queue")
         print(data)
 
-    def startmm(self, decoderConfig):
+    def startmm(self, decoderConfig, StdIn):
         mmProc = ProcessManager(str(decoderConfig.get("mmPath", default="multimon-ng")), textMode=True)
         if decoderConfig.get("fms", default=0):
             mmProc.addArgument("-a FMSFSK")
@@ -81,4 +82,6 @@ class InputBase(ABC):
             mmProc.addArgument("-C " + str(decoderConfig.get("mmChar")))
         mmProc.addArgument("-f alpha")
         mmProc.addArgument("-t raw -")
+        mmProc.setStdin(StdIn)
+        mmProc.setStderr(open(paths.LOG_PATH + "multimon-ng.log", "a"))
         return mmProc
diff --git a/boswatch/inputSource/lineInInput.py b/boswatch/inputSource/lineInInput.py
index 50666ac..032bb5f 100644
--- a/boswatch/inputSource/lineInInput.py
+++ b/boswatch/inputSource/lineInInput.py
@@ -40,9 +40,7 @@ class LineInInput(InputBase):
             lineInProc.setStderr(open(paths.LOG_PATH + "asla.log", "a"))
             lineInProc.start()
 
-            mmProc = self.startmm(decoderConfig)
-            mmProc.setStdin(lineInProc.stdout)
-            mmProc.setStderr(open(paths.LOG_PATH + "multimon-ng.log", "a"))
+            mmProc = self.startmm(decoderConfig, lineInProc.stdout)
             mmProc.start()
 
             logging.info("start decoding")
diff --git a/boswatch/inputSource/pulseaudioInput.py b/boswatch/inputSource/pulseaudioInput.py
index 97a5f79..8f49371 100644
--- a/boswatch/inputSource/pulseaudioInput.py
+++ b/boswatch/inputSource/pulseaudioInput.py
@@ -39,9 +39,7 @@ class PulseAudioInput(InputBase):
             PulseAudioProc.setStderr(open(paths.LOG_PATH + "pulseaudio.log", "a"))
             PulseAudioProc.start()
 
-            mmProc = self.startmm(decoderConfig)
-            mmProc.setStdin(PulseAudioProc.stdout)
-            mmProc.setStderr(open(paths.LOG_PATH + "multimon-ng.log", "a"))
+            mmProc = self.startmm(decoderConfig, PulseAudioProc.stdout)
             mmProc.start()
 
             logging.info("start decoding")
diff --git a/boswatch/inputSource/sdrInput.py b/boswatch/inputSource/sdrInput.py
index 851db22..061711b 100644
--- a/boswatch/inputSource/sdrInput.py
+++ b/boswatch/inputSource/sdrInput.py
@@ -41,9 +41,7 @@ class SdrInput(InputBase):
             sdrProc.setStderr(open(paths.LOG_PATH + "rtl_fm.log", "a"))
             sdrProc.start()
 
-            mmProc = self.startmm(decoderConfig)
-            mmProc.setStdin(sdrProc.stdout)
-            mmProc.setStderr(open(paths.LOG_PATH + "multimon-ng.log", "a"))
+            mmProc = self.startmm(decoderConfig, sdrProc.stdout)
             mmProc.start()
 
             logging.info("start decoding")