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

Compilation error fixed 

Signed-off-by: Paulchen-Panther <Paulchen-Panter@protonmail.com>
This commit is contained in:
Paulchen-Panther 2019-07-20 16:13:40 +02:00
parent f7707bb2d0
commit 370e1b5f45
No known key found for this signature in database
GPG Key ID: 84E3B692456B6840
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/hyperion/Hyperion.h
View File

@ -439,13 +439,15 @@ signals:
/// ///
void started(); void started();
private slots: public slots:
/// ///
/// Updates the priority muxer with the current time and (re)writes the led color with applied /// Updates the priority muxer with the current time and (re)writes the led color with applied
/// transforms. /// transforms.
/// ///
void update(); void update();
private slots:
/// ///
/// @brief Apply ComponentRegister emits for COMP_ALL. Enables/Disables core timers /// @brief Apply ComponentRegister emits for COMP_ALL. Enables/Disables core timers
/// @param comp The component /// @param comp The component

3
libsrc/hyperion/CaptureCont.cpp
View File

@ -81,6 +81,8 @@ void CaptureCont::setSystemCaptureEnable(const bool& enable)
{ {
disconnect(GlobalSignals::getInstance(), &GlobalSignals::setSystemImage, 0, 0); disconnect(GlobalSignals::getInstance(), &GlobalSignals::setSystemImage, 0, 0);
_hyperion->clear(_systemCaptPrio); _hyperion->clear(_systemCaptPrio);
_systemInactiveTimer->stop();
_systemCaptName = "";
} }
_systemCaptEnabled = enable; _systemCaptEnabled = enable;
_hyperion->getComponentRegister().componentStateChanged(hyperion::COMP_GRABBER, enable); _hyperion->getComponentRegister().componentStateChanged(hyperion::COMP_GRABBER, enable);
@ -103,6 +105,7 @@ void CaptureCont::setV4LCaptureEnable(const bool& enable)
disconnect(GlobalSignals::getInstance(), &GlobalSignals::setV4lImage, 0, 0); disconnect(GlobalSignals::getInstance(), &GlobalSignals::setV4lImage, 0, 0);
_hyperion->clear(_v4lCaptPrio); _hyperion->clear(_v4lCaptPrio);
_v4lInactiveTimer->stop(); _v4lInactiveTimer->stop();
_v4lCaptName = "";
} }
_v4lCaptEnabled = enable; _v4lCaptEnabled = enable;
_hyperion->getComponentRegister().componentStateChanged(hyperion::COMP_V4L, enable); _hyperion->getComponentRegister().componentStateChanged(hyperion::COMP_V4L, enable);