frodovdr
/
hyperion.ng
mirror of https://github.com/hyperion-project/hyperion.ng.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix - Audio Capture enabled after reboot automatically (#1581)

This commit is contained in:
LordGrey 2023-04-19 19:29:46 +02:00
parent 8971d77dfe
commit 48dd54ab78
2 changed files with 4 additions and 4 deletions
Show Stats 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();