logging migration of blackborder and grabber (#108)

* logging migration of blackborder and grabber

* change to "Debug" for noise blackborder log messages

include/hyperion/ImageProcessor.h

@@ -8,6 +8,7 @@
 #include <hyperion/ImageProcessorFactory.h>
 #include <hyperion/LedString.h>
 #include <hyperion/ImageToLedsMap.h>
+#include <utils/Logger.h>
 
 // Black border includes
 #include <blackborder/BlackBorderProcessor.h>
@@ -118,7 +119,7 @@ private:
 	{
 		if(_enableBlackBorderRemoval && _borderProcessor->process(image))
 		{
-			std::cout << "BORDER SWITCH REQUIRED!!" << std::endl;
+			Debug(Logger::getInstance("BLACKBORDER"), "BORDER SWITCH REQUIRED!!");
 
 			const hyperion::BlackBorder border = _borderProcessor->getCurrentBorder();
 
@@ -136,7 +137,8 @@ private:
 				_imageToLeds = new hyperion::ImageToLedsMap(image.width(), image.height(), border.horizontalSize, border.verticalSize, _ledString.leds());
 			}
 
-			std::cout << "CURRENT BORDER TYPE: unknown=" << border.unknown << " hor.size=" << border.horizontalSize << " vert.size=" << border.verticalSize << std::endl;
+			Debug(Logger::getInstance("BLACKBORDER"),  "CURRENT BORDER TYPE: unknown=%d hor.size=%d vert.size=%d", 
+				border.unknown, border.horizontalSize, border.verticalSize );
 		}
 	}
 

libsrc/grabber/v4l2/V4L2Grabber.cpp

@@ -412,8 +412,9 @@ void V4L2Grabber::init_device(VideoStandard videoStandard, int input)
 	_width = fmt.fmt.pix.width;
 	_height = fmt.fmt.pix.height;
 
-	// print the eventually used width and height
-	std::cout << "V4L2GRABBER INFO: width=" << _width << " height=" << _height << std::endl;
+	// display the used width and height
+	Info(Logger::getInstance("V4l2GRABBER"), "width=%d height=%d", _width, _height );
+
 
 	// check pixel format and frame size
 	switch (fmt.fmt.pix.pixelformat)

libsrc/leddevice/LedDevicePiBlaster.cpp

@@ -1,6 +1,5 @@
 
 // STL includes
-#include <cerrno>
 #include <cstring>
 #include <csignal>
 

src/hyperion-aml/hyperion-aml.cpp

@@ -11,6 +11,7 @@
 #include "AmlogicWrapper.h"
 
 #include "HyperionConfig.h"
+#include <utils/Logger.h>
 
 
 using namespace vlofgren;
@@ -68,7 +69,8 @@ int main(int argc, char ** argv)
 		int height = argHeight.getValue();
 		if (width < 160 || height < 160)
 		{
-			std::cout << "Minimum width and height is 160" << std::endl;
+			Warning(Logger::getInstance("AMLOGIC"), "Minimum width and height is 160");
+
 			width  = std::max(160, width);
 			height = std::max(160, height);
 		}
@@ -100,7 +102,7 @@ int main(int argc, char ** argv)
 	catch (const std::runtime_error & e)
 	{
 		// An error occured. Display error and quit
-		std::cerr << e.what() << std::endl;
+		Error(Logger::getInstance("AMLOGIC"), "%s", e.what());
 		return -1;
 	}
 	return 0;

src/hyperion-dispmanx/hyperion-dispmanx.cpp

@@ -121,7 +121,7 @@ int main(int argc, char ** argv)
 	catch (const std::runtime_error & e)
 	{
 		// An error occured. Display error and quit
-		std::cerr << e.what() << std::endl;
+                Error(Logger::getInstance("DISPMANXGRABBER"), "%s", e.what());
 		return -1;
 	}
 

src/hyperion-framebuffer/hyperion-framebuffer.cpp

@@ -62,7 +62,7 @@ int main(int argc, char ** argv)
 		int height = argHeight.getValue();
 		if (width < 160 || height < 160)
 		{
-			std::cout << "Minimum width and height is 160" << std::endl;
+			Warning(Logger::getInstance("FRAMEBUFFER"), "Minimum width and height is 160");
 			width  = std::max(160, width);
 			height = std::max(160, height);
 		}
@@ -94,7 +94,7 @@ int main(int argc, char ** argv)
 	catch (const std::runtime_error & e)
 	{
 		// An error occured. Display error and quit
-		std::cerr << e.what() << std::endl;
+                Error(Logger::getInstance("FRAMEBUFFER"), "%s", e.what());
 		return -1;
 	}
 	return 0;

src/hyperion-osx/hyperion-osx.cpp

@@ -62,7 +62,7 @@ int main(int argc, char ** argv)
 		int height = argHeight.getValue();
 		if (width < 160 || height < 160)
 		{
-			std::cout << "Minimum width and height is 160" << std::endl;
+			Warning(Logger::getInstance("OSXGRABBER"), "Minimum width and height is 160");
 			width  = std::max(160, width);
 			height = std::max(160, height);
 		}
@@ -94,7 +94,7 @@ int main(int argc, char ** argv)
 	catch (const std::runtime_error & e)
 	{
 		// An error occured. Display error and quit
-		std::cerr << e.what() << std::endl;
+                Error(Logger::getInstance("OSXGRABBER"), "%s", e.what());
 		return -1;
 	}
 	return 0;

src/hyperion-v4l2/hyperion-v4l2.cpp

@@ -172,7 +172,7 @@ int main(int argc, char** argv)
 	catch (const std::runtime_error & e)
 	{
 		// An error occured. Display error and quit
-		std::cerr << e.what() << std::endl;
+                Error(Logger::getInstance("V4L2GRABBER"), "%s", e.what());
 		return 1;
 	}
 

src/hyperion-x11/hyperion-x11.cpp

@@ -118,7 +118,7 @@ int main(int argc, char ** argv)
 	catch (const std::runtime_error & e)
 	{
 		// An error occured. Display error and quit
-		std::cerr << e.what() << std::endl;
+                Error(Logger::getInstance("X11GRABBER"), "%s", e.what());
 		return -1;
 	}