Fix INGLLogger initialization for BUILD_RTI=OFF compatibility

- Replace NGL::NGLLoggerBootstrap::getNGLRootLogger() with NGL::getMemoryLogger()
  in all VideoOverlayManagement handler classes
- Fix Qt6 signal syntax in avs_interface.cpp (error → errorOccurred)
- Ensures compatibility with BUILD_RTI=OFF builds
- Affected files:
  * logger.cpp - Added BUILD_RTI guards, use NGL::getMemoryLogger()
  * avs_interface.cpp - Logger init + Qt6 signal fix
  * main_handler.cpp - Logger init fix
  * handler_overlays.cpp - Logger init fix
  * handler_infrastructure_data.cpp - Logger init fix
  * handler_participant_data.cpp - Logger init fix

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
torstenandCopilot committed 2026-08-24 12:58:54 +02:00
1 parent f6c2ac04f9
commit 4969e4ff9b
6 files changed
+15 -6

No files matched your search

@@ -25,7 +25,7 @@ AvsInterface::AvsInterface(bool enableTryReconnect, QObject *parent) : QObject(p
, m_keepAliveTime(Settings::getAvsKeepAliveTime()) , m_keepAliveTime(Settings::getAvsKeepAliveTime())
, m_avsIfConnectionState(AvsIfConnectionState::Undefined) , m_avsIfConnectionState(AvsIfConnectionState::Undefined)
, m_socket(nullptr), , m_socket(nullptr),
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) { m_logger(NGL::getMemoryLogger()) {
doConnect(); doConnect();
connect(m_avsKeepAliveTimer, &QTimer::timeout, connect(m_avsKeepAliveTimer, &QTimer::timeout,
@@ -54,7 +54,7 @@ void AvsInterface::doConnect()
this, &AvsInterface::onConnected); this, &AvsInterface::onConnected);
connect(m_socket, &QTcpSocket::disconnected, connect(m_socket, &QTcpSocket::disconnected,
this, &AvsInterface::onDisonnected); this, &AvsInterface::onDisonnected);
connect(m_socket, QOverload<QAbstractSocket::SocketError>::of(&QTcpSocket::error), connect(m_socket, QOverload<QAbstractSocket::SocketError>::of(&QTcpSocket::errorOccurred),
this, &AvsInterface::onError); this, &AvsInterface::onError);
connect(m_socket, &QTcpSocket::readyRead, connect(m_socket, &QTcpSocket::readyRead,
this, &AvsInterface::onReadyRead); this, &AvsInterface::onReadyRead);
@@ -18,7 +18,7 @@ using namespace VideoOverlayManagement;
HandlerInfrastructureData::HandlerInfrastructureData(const std::shared_ptr<DdsHandler> &ddsHandler, QObject *parent) : QObject(parent) HandlerInfrastructureData::HandlerInfrastructureData(const std::shared_ptr<DdsHandler> &ddsHandler, QObject *parent) : QObject(parent)
, m_ddsHandler(ddsHandler) , m_ddsHandler(ddsHandler)
, m_exerciseId(0), , m_exerciseId(0),
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) { m_logger(NGL::getMemoryLogger()) {
} // end of ctor() } // end of ctor()
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -24,7 +24,7 @@ HandlerOverlays::HandlerOverlays(AvsInterface *avsIf,
, m_handlerParticipantData(handlerParticipantData) , m_handlerParticipantData(handlerParticipantData)
, m_handlerInfrastructureData(handlerInfrastructureData) , m_handlerInfrastructureData(handlerInfrastructureData)
, m_exerciseId(exerciseId), , m_exerciseId(exerciseId),
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) { m_logger(NGL::getMemoryLogger()) {
} // end of ctor() } // end of ctor()
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -17,7 +17,7 @@ using namespace VideoOverlayManagement;
HandlerParticipantData::HandlerParticipantData(const std::shared_ptr<DdsHandler> &ddsHandler, QObject *parent) : QObject(parent) HandlerParticipantData::HandlerParticipantData(const std::shared_ptr<DdsHandler> &ddsHandler, QObject *parent) : QObject(parent)
, m_ddsHandler(ddsHandler), , m_ddsHandler(ddsHandler),
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) { m_logger(NGL::getMemoryLogger()) {
} // end of ctor() } // end of ctor()
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -7,7 +7,12 @@
*/ */
#include "logger.h" #include "logger.h"
#if BUILD_RTI
#include <NGLLogger/NGLLoggerBootstrap.h> #include <NGLLogger/NGLLoggerBootstrap.h>
#else
#include <NGLLogger.h>
#endif
namespace VideoOverlayManagement namespace VideoOverlayManagement
{ {
@@ -21,6 +26,7 @@ LOGGER_T getLogger(const char *name)
loggerName.append(ns, sizeof(ns) - 1); loggerName.append(ns, sizeof(ns) - 1);
loggerName.append(name, len); loggerName.append(name, len);
#if BUILD_RTI
try try
{ {
return NGL::NGLLoggerBootstrap::getNGLRootLogger(). return NGL::NGLLoggerBootstrap::getNGLRootLogger().
@@ -31,6 +37,9 @@ LOGGER_T getLogger(const char *name)
fprintf(stderr, "Error retrieving logger: %s", ex.what()); fprintf(stderr, "Error retrieving logger: %s", ex.what());
abort(); abort();
} }
#else
return NGL::getMemoryLogger(loggerName);
#endif
} }
} // namespace VideoOverlayManagement } // namespace VideoOverlayManagement
@@ -30,7 +30,7 @@ MainHandler::MainHandler(QObject *parent) : QObject(parent)
, m_checkConnectTimer(new QTimer(this)) , m_checkConnectTimer(new QTimer(this))
, m_keepAliveTriggerTimer(new QTimer(this)) , m_keepAliveTriggerTimer(new QTimer(this))
, m_bAvsSocketWarnedOnce(false), , m_bAvsSocketWarnedOnce(false),
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) { m_logger(NGL::getMemoryLogger()) {
} // end of ctor() } // end of ctor()
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------