Fix some includes

Lord-Grey · Lord-Grey · commit 4912ca1ec075 · 2025-03-01T18:32:49.000+01:00
diff --git a/src/hyperion-aml/hyperion-aml.cpp b/src/hyperion-aml/hyperion-aml.cpp
@@ -1,6 +1,7 @@
 
 // QT includes
 #include <QCoreApplication>
+#include <QTimer>
 #include <QImage>
 
 #include <utils/DefaultSignalHandler.h>
@@ -130,36 +131,26 @@ int main(int argc, char ** argv)
 	}
 	else
 	{
-		QString host;
-		QString const serviceName {QHostInfo::localHostName()};
+		QString hostname;
 		int port{ FLATBUFFER_DEFAULT_PORT };
 
 		// Split hostname and port (or use default port)
 		QString const givenAddress = argAddress.value(parser);
-		if (!NetUtils::resolveHostPort(givenAddress, host, port))
+		if (!NetUtils::resolveHostPort(givenAddress, hostname, port))
 		{
 			emit errorManager.errorOccurred(QString("Wrong address: unable to parse address (%1)").arg(givenAddress));
 		}
 
 		// Search available Hyperion services via mDNS, if default/localhost IP is given
-		if (host == "127.0.0.1" || host == "::1")
+		QHostAddress hostAddress;
+		if (!NetUtils::resolveHostToAddress(log, hostname, hostAddress, port))
 		{
-#ifndef ENABLE_MDNS
-			SSDPDiscover discover;
-			host = discover.getFirstService(searchType::STY_FLATBUFSERVER);
-#endif
-			QHostAddress address;
-			if (!NetUtils::resolveHostToAddress(log, host, address, port))
-			{
-				emit errorManager.errorOccurred(QString("Address could not be resolved for hostname: %2").arg(QSTRING_CSTR(host)));
+			emit errorManager.errorOccurred(QString("Address could not be resolved for hostname: %2").arg(QSTRING_CSTR(hostAddress.toString())));
 			}
-			host = address.toString();
-		}
-
-		Info(log, "Connecting to Hyperion host: %s, port: %u using service: %s", QSTRING_CSTR(host), port, QSTRING_CSTR(serviceName));
+		Info(log, "Connecting to Hyperion host: %s, port: %u", QSTRING_CSTR(hostAddress.toString()), port);
 
 		// Create the Flabuf-connection
-		FlatBufferConnection const flatbuf(CAPTURE_TYPE + " Standalone", host, argPriority.getInt(parser), parser.isSet(argSkipReply), port);
+		FlatBufferConnection const flatbuf(CAPTURE_TYPE + " Standalone", hostAddress, argPriority.getInt(parser), parser.isSet(argSkipReply), port);
 
 		// Connect the screen capturing to flatbuf connection processing
 		QObject::connect(&grabber, &AmlogicWrapper::sig_screenshot,
diff --git a/src/hyperion-dispmanx/hyperion-dispmanx.cpp b/src/hyperion-dispmanx/hyperion-dispmanx.cpp
@@ -1,6 +1,7 @@
 
 // QT includes
 #include <QCoreApplication>
+#include <QTimer>
 #include <QImage>
 
 #include <utils/DefaultSignalHandler.h>
diff --git a/src/hyperion-framebuffer/hyperion-framebuffer.cpp b/src/hyperion-framebuffer/hyperion-framebuffer.cpp
@@ -1,5 +1,6 @@
 // QT includes
 #include <QCoreApplication>
+#include <QTimer>
 #include <QImage>
 
 #include <utils/DefaultSignalHandler.h>
diff --git a/src/hyperion-osx/OsxWrapper.cpp b/src/hyperion-osx/OsxWrapper.cpp
@@ -28,7 +28,7 @@ const Image<ColorRgb> & OsxWrapper::getScreenshot()
 	return _screenshot;
 }
 
-bool OsxWrapper::displayInit()
+bool OsxWrapper::screenInit()
 {
 	return _grabber.setupDisplay();
 }
diff --git a/src/hyperion-osx/hyperion-osx.cpp b/src/hyperion-osx/hyperion-osx.cpp
@@ -2,6 +2,7 @@
 
 // QT includes
 #include <QCoreApplication>
+#include <QTimer>
 #include <QImage>
 
 #include <utils/DefaultSignalHandler.h>
diff --git a/src/hyperion-qt/QtWrapper.cpp b/src/hyperion-qt/QtWrapper.cpp
@@ -37,7 +37,7 @@ void QtWrapper::stop()
 	_timer.stop();
 }
 
-bool QtWrapper::displayInit()
+bool QtWrapper::screenInit()
 {
 	return _grabber.setupDisplay();
 }
diff --git a/src/hyperion-qt/QtWrapper.h b/src/hyperion-qt/QtWrapper.h
@@ -29,7 +29,7 @@ class QtWrapper : public QObject
 
 	void stop();
 
-	bool displayInit();
+	bool screenInit();
 
 signals:
 	void sig_screenshot(const Image<ColorRgb> & screenshot);
diff --git a/src/hyperion-qt/hyperion-qt.cpp b/src/hyperion-qt/hyperion-qt.cpp
@@ -1,5 +1,6 @@
 // QT includes
 #include <QCoreApplication>
+#include <QTimer>
 #include <QImage>
 
 #include <utils/DefaultSignalHandler.h>
@@ -108,7 +109,7 @@ int main(int argc, char ** argv)
 				argCropBottom.getInt(parser)
 				);
 
-	if (!grabber.displayInit())
+	if (!grabber.screenInit())
 	{
 		emit errorManager.errorOccurred("Failed to initialise the screen/display for this grabber");
 	}
diff --git a/src/hyperion-remote/JsonConnection.h b/src/hyperion-remote/JsonConnection.h
@@ -4,9 +4,10 @@
 #include <QColor>
 #include <QImage>
 #include <QTcpSocket>
+#include <QHostAddress>
 #include <QJsonObject>
 #include <QScopedPointer>
-#include <qjsonarray.h>
+#include <QJsonArray>
 
 //forward class decl
 class Logger;
diff --git a/src/hyperion-remote/hyperion-remote.cpp b/src/hyperion-remote/hyperion-remote.cpp
@@ -7,6 +7,7 @@
 // Qt includes
 #include <QCoreApplication>
 #include <QLocale>
+#include <QTimer>
 
 #include <utils/DefaultSignalHandler.h>
 #include <utils/ErrorManager.h>
diff --git a/src/hyperion-v4l2/hyperion-v4l2.cpp b/src/hyperion-v4l2/hyperion-v4l2.cpp
@@ -1,10 +1,10 @@
 // STL includes
 #include <csignal>
-#include <iomanip>
 #include <clocale>
 
 // QT includes
 #include <QCoreApplication>
+#include <QTimer>
 
 #include <utils/DefaultSignalHandler.h>
 #include <utils/ErrorManager.h>
@@ -148,6 +148,10 @@ int main(int argc, char** argv)
 
 	// initialize the grabber
 	V4L2Grabber grabber;
+	if (!grabber.prepare())
+	{
+		emit errorManager.errorOccurred("Failed to initialise this grabber");
+	}
 
 	// set device
 	grabber.setDevice(argDevice.value(parser), "");
@@ -244,8 +248,7 @@ int main(int argc, char** argv)
 
 		QString const fileName = "screenshot.png";
 		ScreenshotHandler handler(fileName, signalDetectionOffset);
-		QObject::connect(&grabber, SIGNAL(newFrame(Image<ColorRgb>)), &handler, SLOT(receiveImage(Image<ColorRgb>)));
-		grabber.prepare();
+		QObject::connect(&grabber, &V4L2Grabber::newFrame, &handler, &ScreenshotHandler::receiveImage);
 		grabber.start();
 		QCoreApplication::exec();
 		grabber.stop();
@@ -278,8 +281,6 @@ int main(int argc, char** argv)
 						 static_cast<void (FlatBufferConnection::*)(const Image<ColorRgb>&)>(&FlatBufferConnection::setImage));
 
 		// Start the capturing
-		if (grabber.prepare())
-		{
 			QObject::connect(&flatbuf, &FlatBufferConnection::isReadyToSend, [&]() {
 				Debug(log,"Start grabber");
 				grabber.start();
@@ -297,7 +298,6 @@ int main(int argc, char** argv)
 			});
 			// Start the application
 			app.exec();
-		}
 	}
 
 	Logger::deleteInstance();
diff --git a/src/hyperion-x11/X11Wrapper.cpp b/src/hyperion-x11/X11Wrapper.cpp
@@ -36,7 +36,7 @@ void X11Wrapper::stop()
 	_timer.stop();
 }
 
-bool X11Wrapper::displayInit()
+bool X11Wrapper::screenInit()
 {
 	return _grabber.setupDisplay();
 }
diff --git a/src/hyperion-x11/hyperion-x11.cpp b/src/hyperion-x11/hyperion-x11.cpp
@@ -1,6 +1,7 @@
 
 // QT includes
-#include <QApplication>
+#include <QCoreApplication>
+#include <QTimer>
 #include <QImage>
 
 #include <utils/DefaultSignalHandler.h>
diff --git a/src/hyperion-xcb/hyperion-xcb.cpp b/src/hyperion-xcb/hyperion-xcb.cpp
@@ -1,5 +1,6 @@
 // QT includes
-#include <QApplication>
+#include <QCoreApplication>
+#include <QTimer>
 #include <QImage>
 
 #include <utils/DefaultSignalHandler.h>

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ const Image<ColorRgb> & OsxWrapper::getScreenshot()`
`28`	`28`	`return _screenshot;`
`29`	`29`	`}`
`30`	`30`
`31`		`-bool OsxWrapper::displayInit()`
	`31`	`+bool OsxWrapper::screenInit()`
`32`	`32`	`{`
`33`	`33`	`return _grabber.setupDisplay();`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ void QtWrapper::stop()`
`37`	`37`	`_timer.stop();`
`38`	`38`	`}`
`39`	`39`
`40`		`-bool QtWrapper::displayInit()`
	`40`	`+bool QtWrapper::screenInit()`
`41`	`41`	`{`
`42`	`42`	`return _grabber.setupDisplay();`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`// QT includes`
`2`	`2`	`#include <QCoreApplication>`
	`3`	`+#include <QTimer>`
`3`	`4`	`#include <QImage>`
`4`	`5`
`5`	`6`	`#include <utils/DefaultSignalHandler.h>`
`@@ -108,7 +109,7 @@ int main(int argc, char ** argv)`
`108`	`109`	`argCropBottom.getInt(parser)`
`109`	`110`	`);`
`110`	`111`
`111`		`- if (!grabber.displayInit())`
	`112`	`+ if (!grabber.screenInit())`
`112`	`113`	`{`
`113`	`114`	`emit errorManager.errorOccurred("Failed to initialise the screen/display for this grabber");`
`114`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ void X11Wrapper::stop()`
`36`	`36`	`_timer.stop();`
`37`	`37`	`}`
`38`	`38`
`39`		`-bool X11Wrapper::displayInit()`
	`39`	`+bool X11Wrapper::screenInit()`
`40`	`40`	`{`
`41`	`41`	`return _grabber.setupDisplay();`
`42`	`42`	`}`