From f6cc92606c5de2f1d2750d37d48ee69883a63c3f Mon Sep 17 00:00:00 2001
From: Thinner77 <59623671+Thinner77@users.noreply.github.com>
Date: Mon, 13 May 2024 19:31:51 +0200
Subject: [PATCH] Change confusing logic (#1731)

* Change confusing logic

* Change confusing logic #2

* revert indent

---------

Co-authored-by: Thinner77 <none>
---
 include/grabber/video/mediafoundation/MFGrabber.h  | 2 +-
 include/grabber/video/v4l2/V4L2Grabber.h           | 2 +-
 libsrc/grabber/video/mediafoundation/MFGrabber.cpp | 6 +++---
 libsrc/grabber/video/v4l2/V4L2Grabber.cpp          | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/grabber/video/mediafoundation/MFGrabber.h b/include/grabber/video/mediafoundation/MFGrabber.h
index 30142069..47c8cc62 100644
--- a/include/grabber/video/mediafoundation/MFGrabber.h
+++ b/include/grabber/video/mediafoundation/MFGrabber.h
@@ -119,7 +119,7 @@ private:
 	QAtomicInt									_currentFrame;
 	ColorRgb									_noSignalThresholdColor;
 	bool										_signalDetectionEnabled,
-												_noSignalDetected,
+												_signalDetected,
 												_initialized,
 												_reload;
 	double										_x_frac_min,
diff --git a/include/grabber/video/v4l2/V4L2Grabber.h b/include/grabber/video/v4l2/V4L2Grabber.h
index 75b375df..5ac00738 100644
--- a/include/grabber/video/v4l2/V4L2Grabber.h
+++ b/include/grabber/video/v4l2/V4L2Grabber.h
@@ -158,7 +158,7 @@ private:
 	// signal detection
 	int      _noSignalCounterThreshold;
 	ColorRgb _noSignalThresholdColor;
-	bool     _standbyActivated, _signalDetectionEnabled, _noSignalDetected;
+	bool     _standbyActivated, _signalDetectionEnabled, _signalDetected;
 	int      _noSignalCounter;
 	int		_brightness, _contrast, _saturation, _hue;
 	double   _x_frac_min;
diff --git a/libsrc/grabber/video/mediafoundation/MFGrabber.cpp b/libsrc/grabber/video/mediafoundation/MFGrabber.cpp
index ca2b6a35..1cacf4aa 100644
--- a/libsrc/grabber/video/mediafoundation/MFGrabber.cpp
+++ b/libsrc/grabber/video/mediafoundation/MFGrabber.cpp
@@ -42,7 +42,7 @@ MFGrabber::MFGrabber()
 	, _currentFrame(0)
 	, _noSignalThresholdColor(ColorRgb{0,0,0})
 	, _signalDetectionEnabled(true)
-	, _noSignalDetected(false)
+	, _signalDetected(false)
 	, _initialized(false)
 	, _reload(false)
 	, _x_frac_min(0.25)
@@ -580,7 +580,7 @@ void MFGrabber::newThreadFrame(Image<ColorRgb> image)
 		{
 			if (_noSignalCounter >= _noSignalCounterThreshold)
 			{
-				_noSignalDetected = true;
+				_signalDetected = true;
 				Info(_log, "Signal detected");
 			}
 
@@ -593,7 +593,7 @@ void MFGrabber::newThreadFrame(Image<ColorRgb> image)
 		}
 		else if (_noSignalCounter == _noSignalCounterThreshold)
 		{
-			_noSignalDetected = false;
+			_signalDetected = false;
 			Info(_log, "Signal lost");
 		}
 	}
diff --git a/libsrc/grabber/video/v4l2/V4L2Grabber.cpp b/libsrc/grabber/video/v4l2/V4L2Grabber.cpp
index 9ac2972d..d4a73ab9 100644
--- a/libsrc/grabber/video/v4l2/V4L2Grabber.cpp
+++ b/libsrc/grabber/video/v4l2/V4L2Grabber.cpp
@@ -81,7 +81,7 @@ V4L2Grabber::V4L2Grabber()
 	, _noSignalThresholdColor(ColorRgb{0,0,0})
 	, _standbyActivated(false)
 	, _signalDetectionEnabled(true)
-	, _noSignalDetected(false)
+	, _signalDetected(false)
 	, _noSignalCounter(0)
 	, _brightness(0)
 	, _contrast(0)
@@ -1060,7 +1060,7 @@ void V4L2Grabber::newThreadFrame(Image<ColorRgb> image)
 		{
 			if (_noSignalCounter >= _noSignalCounterThreshold)
 			{
-				_noSignalDetected = true;
+				_signalDetected = true;
 				Info(_log, "Signal detected");
 			}
 
@@ -1073,7 +1073,7 @@ void V4L2Grabber::newThreadFrame(Image<ColorRgb> image)
 		}
 		else if (_noSignalCounter == _noSignalCounterThreshold)
 		{
-			_noSignalDetected = false;
+			_signalDetected = false;
 			Info(_log, "Signal lost");
 		}
 	}