From e7e4ddcadee6d8a7b4ae264658bb7a40e5db814f Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Mon, 4 Jan 2021 10:18:52 -0500 Subject: [PATCH] Update Stream Methods --- fHDHR/device/tuners/stream/direct_m3u8_stream.py | 1 + fHDHR/device/tuners/stream/direct_stream.py | 1 + fHDHR/device/tuners/stream/ffmpeg_stream.py | 2 ++ fHDHR/device/tuners/stream/vlc_stream.py | 1 + 4 files changed, 5 insertions(+) diff --git a/fHDHR/device/tuners/stream/direct_m3u8_stream.py b/fHDHR/device/tuners/stream/direct_m3u8_stream.py index 8140e22..57de2e7 100644 --- a/fHDHR/device/tuners/stream/direct_m3u8_stream.py +++ b/fHDHR/device/tuners/stream/direct_m3u8_stream.py @@ -93,6 +93,7 @@ class Direct_M3U8_Stream(): except Exception as e: self.fhdhr.logger.info("Connection Closed: " + str(e)) finally: + self.fhdhr.logger.info("Connection Closed: Tuner Lock Removed") self.tuner.close() # raise TunerError("806 - Tune Failed") diff --git a/fHDHR/device/tuners/stream/direct_stream.py b/fHDHR/device/tuners/stream/direct_stream.py index ea8c22b..25d373a 100644 --- a/fHDHR/device/tuners/stream/direct_stream.py +++ b/fHDHR/device/tuners/stream/direct_stream.py @@ -57,6 +57,7 @@ class Direct_Stream(): self.fhdhr.logger.info("Connection Closed: " + str(e)) finally: req.close() + self.fhdhr.logger.info("Connection Closed: Tuner Lock Removed") self.tuner.close() # raise TunerError("806 - Tune Failed") diff --git a/fHDHR/device/tuners/stream/ffmpeg_stream.py b/fHDHR/device/tuners/stream/ffmpeg_stream.py index 552a879..4d469f5 100644 --- a/fHDHR/device/tuners/stream/ffmpeg_stream.py +++ b/fHDHR/device/tuners/stream/ffmpeg_stream.py @@ -38,6 +38,8 @@ class FFMPEG_Stream(): finally: ffmpeg_proc.terminate() ffmpeg_proc.communicate() + ffmpeg_proc.kill() + self.fhdhr.logger.info("Connection Closed: Tuner Lock Removed") self.tuner.close() # raise TunerError("806 - Tune Failed") diff --git a/fHDHR/device/tuners/stream/vlc_stream.py b/fHDHR/device/tuners/stream/vlc_stream.py index 6f9ad1a..c692ddc 100644 --- a/fHDHR/device/tuners/stream/vlc_stream.py +++ b/fHDHR/device/tuners/stream/vlc_stream.py @@ -39,6 +39,7 @@ class VLC_Stream(): finally: vlc_proc.terminate() vlc_proc.communicate() + vlc_proc.kill() self.fhdhr.logger.info("Connection Closed: Tuner Lock Removed") self.tuner.close() # raise TunerError("806 - Tune Failed")