mirror of
				https://github.com/hyperion-project/hyperion.ng.git
				synced 2025-03-01 10:33:28 +00:00 
			
		
		
		
	Remove handleEvent from V4L2grabber, as grabber will be stopped on suspend
This commit is contained in:
		@@ -92,8 +92,6 @@ public slots:
 | 
			
		||||
	void stop();
 | 
			
		||||
	void newThreadFrame(Image<ColorRgb> image);
 | 
			
		||||
 | 
			
		||||
	void handleEvent(Event event) override;
 | 
			
		||||
 | 
			
		||||
signals:
 | 
			
		||||
	void newFrame(const Image<ColorRgb> & image);
 | 
			
		||||
	void readError(const char* err);
 | 
			
		||||
 
 | 
			
		||||
@@ -142,7 +142,7 @@ bool CECHandler::enable()
 | 
			
		||||
		const auto adapters = getAdapters();
 | 
			
		||||
		if (adapters.isEmpty())
 | 
			
		||||
		{
 | 
			
		||||
			Error(_logger, "Failed to find any CEC adapter.");
 | 
			
		||||
			Error(_logger, "Failed to find any CEC adapter. CEC event handling will be disabled.");
 | 
			
		||||
			_cecAdapter->Close();
 | 
			
		||||
			return false;
 | 
			
		||||
		}
 | 
			
		||||
 
 | 
			
		||||
@@ -1220,24 +1220,6 @@ bool V4L2Grabber::reload(bool force)
 | 
			
		||||
	return false;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void V4L2Grabber::handleEvent(Event event)
 | 
			
		||||
{
 | 
			
		||||
	switch (event)
 | 
			
		||||
	{
 | 
			
		||||
	case Event::Suspend:
 | 
			
		||||
	case Event::Idle:
 | 
			
		||||
		Debug(_log,"Suspend/Idle event received");
 | 
			
		||||
		_standbyActivated = true;
 | 
			
		||||
		return;
 | 
			
		||||
	case Event::Resume:
 | 
			
		||||
	case Event::ResumeIdle:
 | 
			
		||||
		Debug(_log,"Resume event received");
 | 
			
		||||
		_standbyActivated = false;
 | 
			
		||||
		return;
 | 
			
		||||
	default: break;
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
QJsonArray V4L2Grabber::discover(const QJsonObject& params)
 | 
			
		||||
{
 | 
			
		||||
	DebugIf(verbose, _log, "params: [%s]", QString(QJsonDocument(params).toJson(QJsonDocument::Compact)).toUtf8().constData());
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user