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

Commits from @MartB and more ...

Browse Source 
- Commit: 1d9165f403
- New default QT capture implementation
- UploadHandler added to Effects Configurator to allow uploading GIF files
- Docker compile script and instruction
- Travis Fix
This commit is contained in:
Paulchen-Panther
2019-01-06 19:49:56 +01:00
parent 7352ff4d42
commit 2dca1c93e6
57 changed files with 1134 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libsrc/hyperion/GrabberWrapper.cpp
View File

@@ -77,6 +77,10 @@ QStringList GrabberWrapper::availableGrabbers()
grabbers << "x11";
#endif
#ifdef ENABLE_QT
grabbers << "qt";
#endif
return grabbers;
}

4
libsrc/hyperion/Hyperion.cpp
View File

@@ -529,9 +529,9 @@ int Hyperion::setEffect(const QString &effectName, int priority, int timeout, co
return _effectEngine->runEffect(effectName, priority, timeout, origin);
}
int Hyperion::setEffect(const QString &effectName, const QJsonObject &args, int priority, int timeout, const QString & pythonScript, const QString & origin)
int Hyperion::setEffect(const QString &effectName, const QJsonObject &args, int priority, int timeout, const QString &pythonScript, const QString &origin, const QString &imageData)
{
return _effectEngine->runEffect(effectName, args, priority, timeout, pythonScript, origin);
return _effectEngine->runEffect(effectName, args, priority, timeout, pythonScript, origin, 0, imageData);
}
void Hyperion::setLedMappingType(const int& mappingType)

13
libsrc/hyperion/ImageToLedsMap.cpp
View File

@@ -47,19 +47,24 @@ ImageToLedsMap::ImageToLedsMap(
minX_idx = qMin(minX_idx, xOffset + actualWidth - 1);
if (minX_idx == maxX_idx)
{
maxX_idx = minX_idx + 1;
maxX_idx++;
}
minY_idx = qMin(minY_idx, yOffset + actualHeight - 1);
if (minY_idx == maxY_idx)
{
maxY_idx = minY_idx + 1;
maxY_idx++;
}
// Add all the indices in the above defined rectangle to the indices for this led
const auto maxYLedCount = qMin(maxY_idx, yOffset+actualHeight);
const auto maxXLedCount = qMin(maxX_idx, xOffset+actualWidth);
std::vector<unsigned> ledColors;
for (unsigned y = minY_idx; y<maxY_idx && y<(yOffset+actualHeight); ++y)
ledColors.reserve(maxXLedCount*maxYLedCount);
for (unsigned y = minY_idx; y < maxYLedCount; ++y)
{
for (unsigned x = minX_idx; x<maxX_idx && x<(xOffset+actualWidth); ++x)
for (unsigned x = minX_idx; x < maxXLedCount; ++x)
{
ledColors.push_back(y*width + x);
}

2
libsrc/hyperion/schema/schema-framegrabber.json
View File

@@ -7,7 +7,7 @@
{
"type" : "string",
"title" : "edt_conf_fg_type_title",
"enum" : ["auto","dispmanx","amlogic","x11","framebuffer"],
"enum" : ["auto","dispmanx","amlogic","x11","framebuffer","qt"],
"default" : "auto",
"propertyOrder" : 2
},