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

destroy grabbers and other stuff on hyperiond restart via webui (#375)

Browse Source 
* remove obsolete kodi code for grabbers

* destroy grabbers and other stuff on hyperiond restart via webui
This commit is contained in:
redPanther
2017-01-22 14:31:11 +01:00
committed by GitHub
parent abc798a479
commit 3aa2573b88
7 changed files with 36 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/hyperiond/hyperiond.cpp
View File

@@ -79,6 +79,13 @@ HyperionDaemon::HyperionDaemon(QString configFile, QObject *parent)
HyperionDaemon::~HyperionDaemon()
{
freeObjects();
delete _hyperion;
}
void HyperionDaemon::freeObjects()
{
Debug(_log, "destroy grabbers and network stuff");
delete _amlGrabber;
delete _dispmanx;
delete _fbGrabber;
@@ -92,8 +99,17 @@ HyperionDaemon::~HyperionDaemon()
delete _protoServer;
delete _boblightServer;
delete _udpListener;
delete _hyperion;
_v4l2Grabbers.clear();
_amlGrabber = nullptr;
_dispmanx = nullptr;
_fbGrabber = nullptr;
_osxGrabber = nullptr;
_kodiVideoChecker = nullptr;
_jsonServer = nullptr;
_protoServer = nullptr;
_boblightServer = nullptr;
_udpListener = nullptr;
}
void HyperionDaemon::run()
@@ -113,7 +129,7 @@ void HyperionDaemon::run()
#endif
Info(_log, "Hyperion started");
connect(_hyperion,SIGNAL(closing()),this,SLOT(freeObjects()));
}
int HyperionDaemon::tryLoadConfig(const QString & configFile, const int schemaVersion)