frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes (#1605)

Browse Source 
* Correct misleading Error messages

* Fix that Audio Capture is not shown when there is no screen nor video grabber

* Fix - Audio Capture enabled after reboot automatically (#1581)
This commit is contained in:
LordGrey
2023-05-07 14:04:45 +02:00
committed by GitHub
parent 79b31e16e0
commit 5535b884bf
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libsrc/hyperion/CaptureCont.cpp
View File

@@ -97,7 +97,7 @@ void CaptureCont::setSystemCaptureEnable(bool enable)
}
else
{
disconnect(GlobalSignals::getInstance(), &GlobalSignals::setSystemImage, this, 0);
disconnect(GlobalSignals::getInstance(), &GlobalSignals::setSystemImage, this, nullptr);
_hyperion->clear(_systemCaptPrio);
_systemInactiveTimer->stop();
_systemCaptName = "";
@@ -120,7 +120,7 @@ void CaptureCont::setV4LCaptureEnable(bool enable)
}
else
{
disconnect(GlobalSignals::getInstance(), &GlobalSignals::setV4lImage, this, 0);
disconnect(GlobalSignals::getInstance(), &GlobalSignals::setV4lImage, this, nullptr);
_hyperion->clear(_v4lCaptPrio);
_v4lInactiveTimer->stop();
_v4lCaptName = "";
@@ -143,7 +143,7 @@ void CaptureCont::setAudioCaptureEnable(bool enable)
}
else
{
disconnect(GlobalSignals::getInstance(), &GlobalSignals::setAudioImage, this, 0);
disconnect(GlobalSignals::getInstance(), &GlobalSignals::setAudioImage, this, nullptr);
_hyperion->clear(_audioCaptPrio);
_audioInactiveTimer->stop();
_audioCaptName = "";

2
libsrc/hyperion/GrabberWrapper.cpp
View File

@@ -290,7 +290,7 @@ void GrabberWrapper::handleSourceRequest(hyperion::Components component, int hyp
else
GRABBER_AUDIO_CLIENTS.remove(hyperionInd);
if (GRABBER_AUDIO_CLIENTS.empty())
if (GRABBER_AUDIO_CLIENTS.empty() || !getAudioGrabberState())
stop();
else
start();