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

Add additional system info (#1078)

Browse Source
This commit is contained in:
LordGrey
2020-11-14 16:34:31 +01:00
committed by GitHub
parent 758d9a70c5
commit d5a1e7d19d
9 changed files with 78 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/hyperiond/hyperiond.cpp
View File

@@ -137,7 +137,7 @@ HyperionDaemon::HyperionDaemon(const QString rootPath, QObject *parent, bool log
// ---- grabber -----
#if !defined(ENABLE_DISPMANX) && !defined(ENABLE_OSX) && !defined(ENABLE_FB) && !defined(ENABLE_X11) && !defined(ENABLE_XCB) && !defined(ENABLE_AMLOGIC) && !defined(ENABLE_QT) && !defined(ENABLE_DX)
Warning(_log, "No platform capture can be instantiated, because all grabbers have been left out from the build");
Info(_log, "No platform capture supported on this platform");
#endif
// init system capture (framegrabber)
@@ -595,7 +595,7 @@ void HyperionDaemon::handleSettingsUpdate(settings::type settingsType, const QJs
connect(this, &HyperionDaemon::videoMode, _v4l2Grabber, &V4L2Wrapper::setVideoMode);
connect(this, &HyperionDaemon::settingsChanged, _v4l2Grabber, &V4L2Wrapper::handleSettingsUpdate);
#else
Error(_log, "The v4l2 grabber can not be instantiated, because it has been left out from the build");
Debug(_log, "The v4l2 grabber is not supported on this platform");
#endif
}
}
@@ -612,7 +612,7 @@ void HyperionDaemon::createGrabberDispmanx()
Info(_log, "DISPMANX frame grabber created");
#else
Error(_log, "The dispmanx framegrabber can not be instantiated, because it has been left out from the build");
Debug(_log, "The dispmanx framegrabber is not supported on this platform");
#endif
}
@@ -628,7 +628,7 @@ void HyperionDaemon::createGrabberAmlogic()
Info(_log, "AMLOGIC grabber created");
#else
Error(_log, "The AMLOGIC grabber can not be instantiated, because it has been left out from the build");
Debug(_log, "The AMLOGIC grabber is not supported on this platform");
#endif
}
@@ -647,7 +647,7 @@ void HyperionDaemon::createGrabberX11(const QJsonObject &grabberConfig)
Info(_log, "X11 grabber created");
#else
Error(_log, "The X11 grabber can not be instantiated, because it has been left out from the build");
Debug(_log, "The X11 grabber is not supported on this platform");
#endif
}
@@ -666,7 +666,7 @@ void HyperionDaemon::createGrabberXcb(const QJsonObject &grabberConfig)
Info(_log, "XCB grabber created");
#else
Error(_log, "The XCB grabber can not be instantiated, because it has been left out from the build");
Debug(_log, "The XCB grabber is not supported on this platform");
#endif
}
@@ -685,7 +685,7 @@ void HyperionDaemon::createGrabberQt(const QJsonObject &grabberConfig)
Info(_log, "Qt grabber created");
#else
Error(_log, "The Qt grabber can not be instantiated, because it has been left out from the build");
Debug(_log, "The Qt grabber is not supported on this platform");
#endif
}
@@ -704,7 +704,7 @@ void HyperionDaemon::createGrabberDx(const QJsonObject &grabberConfig)
Info(_log, "DirectX grabber created");
#else
Error(_log, "The DirectX grabber can not be instantiated, because it has been left out from the build");
Debug(_log, "The DirectX is not supported on this platform");
#endif
}
@@ -722,7 +722,7 @@ void HyperionDaemon::createGrabberFramebuffer(const QJsonObject &grabberConfig)
Info(_log, "Framebuffer grabber created");
#else
Error(_log, "The framebuffer grabber can not be instantiated, because it has been left out from the build");
Debug(_log, "The framebuffer is not supported on this platform");
#endif
}
@@ -740,7 +740,7 @@ void HyperionDaemon::createGrabberOsx(const QJsonObject &grabberConfig)
Info(_log, "OSX grabber created");
#else
Error(_log, "The osx grabber can not be instantiated, because it has been left out from the build");
Debug(_log, "The osx grabber is not supported on this platform");
#endif
}
@@ -761,6 +761,6 @@ void HyperionDaemon::createCecHandler()
Info(_log, "CEC handler created");
#else
Error(_log, "The CEC handler can not be instantiated, because it has been left out from the build");
Debug(_log, "The CEC handler is not supported on this platform");
#endif
}

9
src/hyperiond/main.cpp
View File

@@ -256,14 +256,6 @@ int main(int argc, char** argv)
return 0;
}
if (parser.isSet(versionOption))
{
std::cout
<< "Hyperion Ambilight Daemon" << std::endl
<< "\tVersion : " << HYPERION_VERSION << " (" << HYPERION_BUILD_ID << ")" << std::endl
<< "\tBuild Time: " << __DATE__ << " " << __TIME__ << std::endl;
}
if (parser.isSet(exportEfxOption))
{
Q_INIT_RESOURCE(EffectEngine);
@@ -393,6 +385,7 @@ int main(int argc, char** argv)
}
Info(log,"Starting Hyperion - %s, %s, built: %s:%s", HYPERION_VERSION, HYPERION_BUILD_ID, __DATE__, __TIME__);
Debug(log,"QtVersion [%s]", QT_VERSION_STR);
if ( !readonlyMode )
{