From 1a4b3a53028366cc3cae7e48ad57c712e4afdc02 Mon Sep 17 00:00:00 2001
From: jb-alvarado <jb@pixelcrusher.de>
Date: Mon, 3 Feb 2020 20:49:55 +0100
Subject: [PATCH] less import

---
 ffplayout.py       | 14 ++++++--------
 ffplayout/utils.py | 12 ++++++++----
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/ffplayout.py b/ffplayout.py
index b3e07138..8536a73c 100755
--- a/ffplayout.py
+++ b/ffplayout.py
@@ -24,9 +24,7 @@ from threading import Thread
 
 from ffplayout.folder import GetSourceFromFolder, MediaStore, MediaWatcher
 from ffplayout.playlist import GetSourceFromPlaylist
-from ffplayout.utils import (COPY_BUFSIZE, DEC_PREFIX, ENC_PREFIX, _ff, _log,
-                             _playlist, _playout, _pre_comp, _text,
-                             decoder_logger, encoder_logger,
+from ffplayout.utils import (_ff, _log, _playlist, _playout, _pre_comp, _text,
                              ffmpeg_stderr_reader, get_date, messenger,
                              pre_audio_codec, stdin_args, terminate_processes)
 
@@ -37,6 +35,9 @@ try:
 except ImportError:
     print('colorama import failed, no colored console output on windows...')
 
+_WINDOWS = os.name == 'nt'
+COPY_BUFSIZE = 1024 * 1024 if _WINDOWS else 64 * 1024
+
 
 # ------------------------------------------------------------------------------
 # main functions
@@ -86,8 +87,7 @@ def main():
                 stdin=PIPE, stderr=PIPE)
 
         enc_err_thread = Thread(target=ffmpeg_stderr_reader,
-                                args=(_ff.encoder.stderr, encoder_logger,
-                                      ENC_PREFIX))
+                                args=(_ff.encoder.stderr, False))
         enc_err_thread.daemon = True
         enc_err_thread.start()
 
@@ -116,9 +116,7 @@ def main():
                         stdout=PIPE, stderr=PIPE) as _ff.decoder:
 
                     dec_err_thread = Thread(target=ffmpeg_stderr_reader,
-                                            args=(_ff.decoder.stderr,
-                                                  decoder_logger,
-                                                  DEC_PREFIX))
+                                            args=(_ff.decoder.stderr, True))
                     dec_err_thread.daemon = True
                     dec_err_thread.start()
 
diff --git a/ffplayout/utils.py b/ffplayout/utils.py
index 88bc7203..a52dc0c7 100644
--- a/ffplayout/utils.py
+++ b/ffplayout/utils.py
@@ -123,9 +123,6 @@ _playout = SimpleNamespace()
 _init = SimpleNamespace(load=True)
 _ff = SimpleNamespace(decoder=None, encoder=None)
 
-_WINDOWS = os.name == 'nt'
-COPY_BUFSIZE = 1024 * 1024 if _WINDOWS else 64 * 1024
-
 
 def str_to_sec(s):
     if s in ['now', '', None, 'none']:
@@ -590,7 +587,14 @@ def terminate_processes(watcher=None):
         watcher.stop()
 
 
-def ffmpeg_stderr_reader(std_errors, logger, prefix):
+def ffmpeg_stderr_reader(std_errors, decoder):
+    if decoder:
+        logger = decoder_logger
+        prefix = DEC_PREFIX
+    else:
+        logger = encoder_logger
+        prefix = ENC_PREFIX
+
     try:
         for line in std_errors:
             if _log.ff_level == 'INFO':