frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2023-10-10 13:36:59 +02:00
Code Issues Releases Wiki Activity

Demangled config naming convention is framegrabber.

Browse Source 
Former-commit-id: ccb9b98f3e42785620ade9970b33d94c77b93508
This commit is contained in:
T.van der Zwan 2015-08-20 10:14:19 +02:00
parent 31e5d6b147
commit a3db06e90e
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/hyperiond/hyperiond.cpp
View File

@ -263,20 +263,18 @@ int main(int argc, char** argv)
std::cout << "AMLOGIC grabber created and started" << std::endl; std::cout << "AMLOGIC grabber created and started" << std::endl;
} }
#else #else
#if !defined(ENABLE_DISPMANX) && !defined(ENABLE_OSX) if (config.isMember("amlgrabber"))
if (config.isMember("framegrabber"))
{ {
std::cerr << "The framebuffer grabber can not be instantiated, becuse it has been left out from the build" << std::endl; std::cerr << "The AMLOGIC grabber can not be instantiated, because it has been left out from the build" << std::endl;
} }
#endif #endif
#endif
#ifdef ENABLE_FB #ifdef ENABLE_FB
// Construct and start the framebuffer grabber if the configuration is present // Construct and start the framebuffer grabber if the configuration is present
FramebufferWrapper * fbGrabber = nullptr; FramebufferWrapper * fbGrabber = nullptr;
if (config.isMember("framegrabber")) if (config.isMember("framebuffergrabber") || config.isMember("framegrabber"))
{ {
const Json::Value & grabberConfig = config["framegrabber"]; const Json::Value & grabberConfig = config.isMember("framebuffergrabber")? config["framebuffergrabber"] : config.isMember("framegrabber");
fbGrabber = new FramebufferWrapper( fbGrabber = new FramebufferWrapper(
grabberConfig.get("device", "/dev/fb0").asString(), grabberConfig.get("device", "/dev/fb0").asString(),
grabberConfig["width"].asUInt(), grabberConfig["width"].asUInt(),
@ -294,18 +292,24 @@ int main(int argc, char** argv)
std::cout << "Framebuffer grabber created and started" << std::endl; std::cout << "Framebuffer grabber created and started" << std::endl;
} }
#else #else
if (config.isMember("amlgrabber")) if (config.isMember("framebuffergrabber"))
{ {
std::cerr << "The AMLOGIC grabber can not be instantiated, because it has been left out from the build" << std::endl; std::cerr << "The framebuffer grabber can not be instantiated, becuse it has been left out from the build" << std::endl;
} }
#if !defined(ENABLE_DISPMANX) && !defined(ENABLE_OSX)
else if (config.isMember("framegrabber"))
{
std::cerr << "The framebuffer grabber can not be instantiated, becuse it has been left out from the build" << std::endl;
}
#endif
#endif #endif
#ifdef ENABLE_OSX #ifdef ENABLE_OSX
// Construct and start the osx grabber if the configuration is present // Construct and start the osx grabber if the configuration is present
OsxWrapper * osxGrabber = nullptr; OsxWrapper * osxGrabber = nullptr;
if (config.isMember("framegrabber")) if (config.isMember("osxgrabber") || config.isMember("framegrabber"))
{ {
const Json::Value & grabberConfig = config["framegrabber"]; const Json::Value & grabberConfig = config.isMember("osxgrabber")? config["osxgrabber"] : config["framegrabber"];
osxGrabber = new OsxWrapper( osxGrabber = new OsxWrapper(
grabberConfig.get("display", 0).asUInt(), grabberConfig.get("display", 0).asUInt(),
grabberConfig["width"].asUInt(), grabberConfig["width"].asUInt(),
@ -323,8 +327,12 @@ int main(int argc, char** argv)
std::cout << "OSX grabber created and started" << std::endl; std::cout << "OSX grabber created and started" << std::endl;
} }
#else #else
if (config.isMember("osxgrabber"))
{
std::cerr << "The osx grabber can not be instantiated, becuse it has been left out from the build" << std::endl;
}
#if !defined(ENABLE_DISPMANX) && !defined(ENABLE_FB) #if !defined(ENABLE_DISPMANX) && !defined(ENABLE_FB)
if (config.isMember("framegrabber")) else if (config.isMember("framegrabber"))
{ {
std::cerr << "The osx grabber can not be instantiated, becuse it has been left out from the build" << std::endl; std::cerr << "The osx grabber can not be instantiated, becuse it has been left out from the build" << std::endl;
} }