Add autoresume feature for the macOS software grabber (#879)

awawa-dev · Sep 5, 2024 · 99e4f28 · 99e4f28
1 parent 3168734
commit 99e4f28
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/include/grabber/osx/macOS/macOsGrabber.h b/include/grabber/osx/macOS/macOsGrabber.h
@@ -69,7 +69,6 @@ public slots:
 private:
 	QString					_configurationPath;
 	QTimer					_timer;
-	QSemaphore				_semaphore;
 
 	CGDirectDisplayID		_actualDisplay;
 };
diff --git a/sources/grabber/osx/macOS/macOsGrabber.mm b/sources/grabber/osx/macOS/macOsGrabber.mm
@@ -54,7 +54,6 @@
 macOsGrabber::macOsGrabber(const QString& device, const QString& configurationPath)
 	: Grabber(configurationPath, "MACOS_SYSTEM:" + device.left(14))
 	, _configurationPath(configurationPath)
-	, _semaphore(1)
 	, _actualDisplay(0)
 {
 	_timer.setTimerType(Qt::PreciseTimer);
@@ -219,9 +218,7 @@
 {
 	if (_initialized)
 	{
-		_semaphore.acquire();
 		_timer.stop();
-		_semaphore.release();
 		Info(_log, "Stopped");
 	}
 }
@@ -234,9 +231,7 @@
 void macOsGrabber::grabFrame()
 {
 	bool stopNow = false;
-
-	if (_semaphore.tryAcquire())
-	{		
+
 		CGImageRef display;
 		CFDataRef sysData;
 		uint8_t* rawData;
@@ -267,12 +262,10 @@
 			CGImageRelease(display);
 		}
 
-		_semaphore.release();
-	}
-
 	if (stopNow)
 	{
 		uninit();
+		QTimer::singleShot(3000, this, &macOsGrabber::start);
 	}
 }