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 branch 'HEAD' of https://github.com/tvdzwan/hyperion.git into multi_colortransform

Browse Source 
Former-commit-id: fb4ab6331b5428bd34f5cc7ac7eba3fade5ef7dc
This commit is contained in:
T. van der Zwan
2013-11-20 08:26:09 +00:00
parent ba2939f9ec d60cca9e20
commit b967f51f38
14 changed files with 51 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libsrc/CMakeLists.txt
View File

@@ -4,10 +4,13 @@ SET(CURRENT_HEADER_DIR ${CMAKE_SOURCE_DIR}/include)
SET(CURRENT_SOURCE_DIR ${CMAKE_SOURCE_DIR}/libsrc)
add_subdirectory(bootsequence)
add_subdirectory(dispmanx-grabber)
add_subdirectory(hyperion)
add_subdirectory(jsonserver)
add_subdirectory(protoserver)
add_subdirectory(boblightserver)
add_subdirectory(utils)
add_subdirectory(xbmcvideochecker)
if (ENABLE_DISPMANX)
add_subdirectory(dispmanx-grabber)
endif (ENABLE_DISPMANX)

4
libsrc/bootsequence/BootSequenceFactory.cpp
View File

@@ -24,7 +24,7 @@ BootSequence * BootSequenceFactory::createBootSequence(Hyperion * hyperion, cons
const unsigned duration_ms = jsonConfig["duration_ms"].asUInt();
return new RainbowBootSequence(hyperion, duration_ms);
}
else if (type == "knightrider" || type == "knight rider")
else if (type == "knightrider" || type == "knight rider" || "knight_rider")
{
std::cout << "SELECTED BOOT SEQUENCE: " << "KITT" << std::endl;
const unsigned duration_ms = jsonConfig["duration_ms"].asUInt();
@@ -34,5 +34,3 @@ BootSequence * BootSequenceFactory::createBootSequence(Hyperion * hyperion, cons
std::cerr << "Unknown boot-sequence selected; boot-sequence disabled." << std::endl;
return nullptr;
}

3
libsrc/hyperion/CMakeLists.txt
View File

@@ -82,4 +82,5 @@ target_link_libraries(hyperion
hyperion-utils
serialport
${QT_LIBRARIES}
${LIBUSB_1_LIBRARIES})
${LIBUSB_1_LIBRARIES}
${CMAKE_THREAD_LIBS_INIT})

2
libsrc/jsonserver/JsonClientConnection.cpp
View File

@@ -168,7 +168,7 @@ void JsonClientConnection::handleServerInfoCommand(const Json::Value &message)
item["priority"] = priority;
if (priorityInfo.timeoutTime_ms != -1)
{
item["duration_ms"] = priorityInfo.timeoutTime_ms - now;
item["duration_ms"] = Json::Value::UInt(priorityInfo.timeoutTime_ms - now);
}
}