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

Merge remote-tracking branch 'origin' into macos_compile

Browse Source 
Conflicts:
	test/CMakeLists.txt

Former-commit-id: b91fa41ebbd5ec96f6a98dddc49f86b4b8af15d8
This commit is contained in:
T. van der Zwan
2013-12-20 20:02:02 +01:00
parent eb4170c316 e1a60e6944
commit b63fdb0333
5 changed files with 41 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libsrc/boblightserver/BoblightClientConnection.cpp
View File

@@ -145,8 +145,8 @@ void BoblightClientConnection::handleMessage(const QString & message)
red = qMax(0, qMin(255, int(255 * messageParts[4].toFloat(&rc1))));
}
uint8_t green = qMax(0, qMin(255, 255 * int(messageParts[5].toFloat(&rc2))));
uint8_t blue = qMax(0, qMin(255, 255 * int(messageParts[6].toFloat(&rc3))));
uint8_t green = qMax(0, qMin(255, int(255 * messageParts[5].toFloat(&rc2))));
uint8_t blue = qMax(0, qMin(255, int(255 * messageParts[6].toFloat(&rc3))));
if (rc1 && rc2 && rc3)
{