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

Address compile warnings

Browse Source
This commit is contained in:
LordGrey 2024-12-28 19:55:07 +01:00
parent 6791461dc1
commit de66975a85
4 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libsrc/api/JsonAPI.cpp
View File

@ -922,13 +922,17 @@ void JsonAPI::handleSchemaGetCommand(const QJsonObject& /*message*/, const JsonA
// Add infor about the type of setting elements // Add infor about the type of setting elements
QJsonObject settingTypes; QJsonObject settingTypes;
QJsonArray globalSettingTypes; QJsonArray globalSettingTypes;
for (const QString &type : SettingsTable().getGlobalSettingTypes()) {
SettingsTable settingsTable;
for (const QString &type : settingsTable.getGlobalSettingTypes())
{
globalSettingTypes.append(type); globalSettingTypes.append(type);
} }
settingTypes.insert("globalProperties", globalSettingTypes); settingTypes.insert("globalProperties", globalSettingTypes);
QJsonArray instanceSettingTypes; QJsonArray instanceSettingTypes;
for (const QString &type : SettingsTable().getInstanceSettingTypes()) { for (const QString &type : settingsTable.getInstanceSettingTypes())
{
instanceSettingTypes.append(type); instanceSettingTypes.append(type);
} }
settingTypes.insert("instanceProperties", instanceSettingTypes); settingTypes.insert("instanceProperties", instanceSettingTypes);

21
libsrc/leddevice/dev_ftdi/ProviderFtdi.cpp
View File

@ -67,12 +67,12 @@ int ProviderFtdi::open()
Debug(_log, "Opening FTDI device=%s", QSTRING_CSTR(_deviceName)); Debug(_log, "Opening FTDI device=%s", QSTRING_CSTR(_deviceName));
FTDI_CHECK_RESULT((rc = ftdi_usb_open_string(_ftdic, QSTRING_CSTR(_deviceName))) < 0); FTDI_CHECK_RESULT((rc = ftdi_usb_open_string(_ftdic, QSTRING_CSTR(_deviceName))) < 0)
/* doing this disable resets things if they were in a bad state */ /* doing this disable resets things if they were in a bad state */
FTDI_CHECK_RESULT((rc = ftdi_disable_bitbang(_ftdic)) < 0); FTDI_CHECK_RESULT((rc = ftdi_disable_bitbang(_ftdic)) < 0)
FTDI_CHECK_RESULT((rc = ftdi_setflowctrl(_ftdic, SIO_DISABLE_FLOW_CTRL)) < 0); FTDI_CHECK_RESULT((rc = ftdi_setflowctrl(_ftdic, SIO_DISABLE_FLOW_CTRL)) < 0)
FTDI_CHECK_RESULT((rc = ftdi_set_bitmode(_ftdic, 0x00, BITMODE_RESET)) < 0); FTDI_CHECK_RESULT((rc = ftdi_set_bitmode(_ftdic, 0x00, BITMODE_RESET)) < 0)
FTDI_CHECK_RESULT((rc = ftdi_set_bitmode(_ftdic, 0xff, BITMODE_MPSSE)) < 0); FTDI_CHECK_RESULT((rc = ftdi_set_bitmode(_ftdic, 0xff, BITMODE_MPSSE)) < 0)
double reference_clock = 60e6; double reference_clock = 60e6;
int divisor = (reference_clock / 2 / _baudRate_Hz) - 1; int divisor = (reference_clock / 2 / _baudRate_Hz) - 1;
@ -86,7 +86,7 @@ int ProviderFtdi::open()
pinDirection pinDirection
}; };
FTDI_CHECK_RESULT((rc = ftdi_write_data(_ftdic, buf.data(), buf.size())) != buf.size()); FTDI_CHECK_RESULT(static_cast<size_t>(rc = ftdi_write_data(_ftdic, buf.data(), static_cast<int>(buf.size()))) != buf.size())
_isDeviceReady = true; _isDeviceReady = true;
return rc; return rc;
@ -134,7 +134,7 @@ int ProviderFtdi::writeBytes(const qint64 size, const uint8_t *data)
// SET_BITS_LOW takes 2 arguments, so we're inserting data in -3 position from the end // SET_BITS_LOW takes 2 arguments, so we're inserting data in -3 position from the end
buf.insert(buf.end() - 3, &data[0], &data[size]); buf.insert(buf.end() - 3, &data[0], &data[size]);
FTDI_CHECK_RESULT((rc = ftdi_write_data(_ftdic, buf.data(), buf.size())) != buf.size()); FTDI_CHECK_RESULT(static_cast<size_t>(rc = ftdi_write_data(_ftdic, buf.data(), static_cast<int>(buf.size()))) != buf.size())
return rc; return rc;
} }
@ -152,7 +152,7 @@ QJsonObject ProviderFtdi::discover(const QJsonObject & /*params*/)
struct ftdi_device_list *curdev = devlist; struct ftdi_device_list *curdev = devlist;
QMap<QString, uint8_t> deviceIndexes; QMap<QString, uint8_t> deviceIndexes;
while (curdev) while (curdev != nullptr)
{ {
libusb_device_descriptor desc; libusb_device_descriptor desc;
int rc = libusb_get_device_descriptor(curdev->dev, &desc); int rc = libusb_get_device_descriptor(curdev->dev, &desc);
@ -161,8 +161,7 @@ QJsonObject ProviderFtdi::discover(const QJsonObject & /*params*/)
QString vendorIdentifier = QString("0x%1").arg(desc.idVendor, 4, 16, QChar{'0'}); QString vendorIdentifier = QString("0x%1").arg(desc.idVendor, 4, 16, QChar{'0'});
QString productIdentifier = QString("0x%1").arg(desc.idProduct, 4, 16, QChar{'0'}); QString productIdentifier = QString("0x%1").arg(desc.idProduct, 4, 16, QChar{'0'});
QString vendorAndProduct = QString("%1:%2") QString vendorAndProduct = QString("%1:%2")
.arg(vendorIdentifier) .arg(vendorIdentifier,productIdentifier);
.arg(productIdentifier);
uint8_t deviceIndex = deviceIndexes.value(vendorAndProduct, 0); uint8_t deviceIndex = deviceIndexes.value(vendorAndProduct, 0);
char serial_string[128] = {0}; char serial_string[128] = {0};
@ -174,7 +173,7 @@ QJsonObject ProviderFtdi::discover(const QJsonObject & /*params*/)
QString ftdiOpenString; QString ftdiOpenString;
if(!serialNumber.isEmpty()) if(!serialNumber.isEmpty())
{ {
ftdiOpenString = QString("s:%1:%2").arg(vendorAndProduct).arg(serialNumber); ftdiOpenString = QString("s:%1:%2").arg(vendorAndProduct, serialNumber);
} }
else else
{ {

2
libsrc/python/PythonProgram.cpp
View File

@ -25,7 +25,7 @@ PythonProgram::PythonProgram(const QString& name, Logger* log) :
PyEval_RestoreThread(mainThreadState); PyEval_RestoreThread(mainThreadState);
_tstate = Py_NewInterpreter(); _tstate = Py_NewInterpreter();
#else #else
PyThreadState* prev = PyThreadState_Swap(NULL); PyThreadState_Swap(NULL);
// Create a new interpreter configuration object // Create a new interpreter configuration object
PyInterpreterConfig config{}; PyInterpreterConfig config{};

11
libsrc/utils/ImageResampler.cpp
View File

@ -50,16 +50,15 @@ void ImageResampler::processImage(const uint8_t * data, int width, int height, i
outputImage.resize(outputWidth, outputHeight); outputImage.resize(outputWidth, outputHeight);
int xDestStart, xDestEnd; int xDestStart {0};
int yDestStart, yDestEnd; int xDestEnd = {outputWidth-1};
int yDestStart = {0};
int yDestEnd = {outputWidth-1};
switch (_flipMode) switch (_flipMode)
{ {
case FlipMode::NO_CHANGE: case FlipMode::NO_CHANGE:
xDestStart = 0; //use the initalized values
xDestEnd = outputWidth-1;
yDestStart = 0;
yDestEnd = outputHeight-1;
break; break;
case FlipMode::HORIZONTAL: case FlipMode::HORIZONTAL:
xDestStart = 0; xDestStart = 0;