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

Various Fixes/Updates (#1549)

Browse Source 
* Update FindWindowsSDK.cmake

* cmake support libcec without version

* Ensure Light-Ids are strings

* Fix type - do not have dbus as requried

* Fixing #1544

* Cleanup

* CleanupFix #1551

* Consistently return instance number with JSON replies (#1504)

* hyperion-remote- Fix extracting reply for configGet request

* Qt 6.6 - Fix iterator finds

* Fix test_image2ledsmap

* Ensure window.currentHyperionInstanceName is set, cleanup system/log clipboard report

* Address protobuf cmake warning

* Update License

* Update ChangeLog

* Address CodeQL and clang findings
This commit is contained in:
LordGrey
2023-01-16 11:01:28 +00:00
committed by GitHub
parent f665f1e1b6
commit fa7a5b6b56
23 changed files with 187 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/hyperion-aml/hyperion-aml.cpp
View File

@@ -21,13 +21,6 @@
#include <utils/DefaultSignalHandler.h>
// Constants
namespace {
const char SERVICE_TYPE[] = "flatbuffer";
} //End of constants
using namespace commandline;
// save the image as screenshot

7
src/hyperion-dispmanx/hyperion-dispmanx.cpp
View File

@@ -22,13 +22,6 @@
#include <utils/DefaultSignalHandler.h>
// Constants
namespace {
const char SERVICE_TYPE[] = "flatbuffer";
} //End of constants
using namespace commandline;
// save the image as screenshot

7
src/hyperion-osx/hyperion-osx.cpp
View File

@@ -20,13 +20,6 @@
#include <utils/DefaultSignalHandler.h>
// Constants
namespace {
const char SERVICE_TYPE[] = "flatbuffer";
} //End of constants
using namespace commandline;
// save the image as screenshot

12
src/hyperion-remote/JsonConnection.cpp
View File

@@ -215,7 +215,7 @@ QJsonObject JsonConnection::getServerInfo()
{
if (!reply.contains("info") || !reply["info"].isObject())
{
throw std::runtime_error("No info available in result");
throw std::runtime_error("No info available in reply");
}
return reply["info"].toObject();
@@ -240,7 +240,7 @@ QString JsonConnection::getSysInfo()
{
if (!reply.contains("info") || !reply["info"].isObject())
{
throw std::runtime_error("No info available in result");
throw std::runtime_error("No info available in reply");
}
QJsonDocument doc(reply["info"].toObject());
@@ -417,12 +417,12 @@ QString JsonConnection::getConfig(std::string type)
// parse reply message
if (parseReply(reply))
{
if (!reply.contains("result") || !reply["result"].isObject())
if (!reply.contains("info") || !reply["info"].isObject())
{
throw std::runtime_error("No configuration file available in result");
throw std::runtime_error("No configuration file available in reply");
}
QJsonDocument doc(reply["result"].toObject());
QJsonDocument doc(reply["info"].toObject());
QString result(doc.toJson(QJsonDocument::Indented));
return result;
}
@@ -442,7 +442,7 @@ void JsonConnection::setConfig(const QString &jsonString)
QJsonObject configObj;
if(!JsonUtils::parse("hyperion-remote-args", jsonString, configObj, _log))
{
throw std::runtime_error("Error in configset arguments, abort");
throw std::runtime_error("Error in configSet arguments, abort");
}
command["config"] = configObj;

2
src/hyperiond/CMakeLists.txt
View File

@@ -31,7 +31,7 @@ if (APPLE)
endif(APPLE)
if (UNIX)
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS DBus REQUIRED )
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS DBus QUIET )
if (Qt${QT_VERSION_MAJOR}DBus_FOUND)
set(hyperiond_POWER_MNG_DBUS "Qt${QT_VERSION_MAJOR}::DBus")
endif()