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

Added logging to X11Grabber (#71)

Browse Source 
* Added logging to X11Grabber

* Added logging to Amlogic grabber.

* Fixed mistake in amlogicgrabber.h

* fixed compile issue

* Trigger

* cleaned up log messages
This commit is contained in:
XfableX
2016-06-30 00:48:53 +10:00
committed by brindosch
parent e5332c44de
commit 6327a38582
4 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libsrc/grabber/x11/X11Grabber.cpp Normal file → Executable file
View File

@@ -1,6 +1,7 @@
// STL includes
#include <iostream>
#include <cstdint>
#include <utils/Logger.h>
// X11Grabber includes
#include <grabber/X11Grabber.h>
@@ -22,7 +23,8 @@ X11Grabber::X11Grabber(bool useXGetImage, int cropLeft, int cropRight, int cropT
_screenHeight(0),
_croppedWidth(0),
_croppedHeight(0),
_image(0,0)
_image(0,0),
_log(Logger::getInstance("X11GRABBER"))
{
_imageResampler.setHorizontalPixelDecimation(horizontalPixelDecimation);
_imageResampler.setVerticalPixelDecimation(verticalPixelDecimation);
@@ -94,11 +96,11 @@ bool X11Grabber::Setup()
_x11Display = XOpenDisplay(NULL);
if (_x11Display == nullptr)
{
std::cerr << "X11GRABBER ERROR: Unable to open display";
Error(_log, "Unable to open display");
if (getenv("DISPLAY")) {
std::cerr << " " << std::string(getenv("DISPLAY")) << std::endl;
Error(_log, "%s",getenv("DISPLAY"));
} else {
std::cerr << ". DISPLAY environment variable not set" << std::endl;
Error(_log, "DISPLAY environment variable not set");
}
return false;
}
@@ -151,7 +153,7 @@ Image<ColorRgb> & X11Grabber::grab()
if (_xImage == nullptr)
{
std::cerr << "X11GRABBER ERROR: Grab failed" << std::endl;
Error(_log, "Grab Failed!");
return _image;
}
@@ -165,7 +167,7 @@ int X11Grabber::updateScreenDimensions()
const Status status = XGetWindowAttributes(_x11Display, _window, &_windowAttr);
if (status == 0)
{
std::cerr << "X11GRABBER ERROR: Failed to obtain window attributes" << std::endl;
Error(_log, "Failed to obtain window attributes");
return -1;
}