lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adds immediate migration results in progress

Browse Source
This commit is contained in:
torsten committed 2026-08-19 11:18:24 +02:00
1 parent 8453e104c5
commit 3bb6e89496
2102 files changed
+17482 -15071
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/avs_interface.cpp
+15 -16
View File
@@ -17,16 +17,15 @@
namespace VideoOverlayManagement
{
AvsInterface::AvsInterface(bool enableTryReconnect, QObject *parent)
: QObject(parent)
AvsInterface::AvsInterface(bool enableTryReconnect, QObject *parent) : QObject(parent)
, m_waitTime(1)
, m_enableTryReconnect(enableTryReconnect)
, m_tryReconnect(false)
, m_avsKeepAliveTimer(new QTimer(this))
, m_keepAliveTime(Settings::getAvsKeepAliveTime())
, m_avsIfConnectionState(AvsIfConnectionState::Undefined)
, m_socket(nullptr)
{
, m_socket(nullptr),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
doConnect();
connect(m_avsKeepAliveTimer, &QTimer::timeout,
@@ -45,7 +44,7 @@ AvsInterface::~AvsInterface()
void AvsInterface::doConnect()
{
DEBUG_LOG() << "doConnect TCP-Socket ";
DEBUG_LOG(m_logger) << "doConnect TCP-Socket ";
if (m_socket)
m_socket->deleteLater();
@@ -62,7 +61,7 @@ void AvsInterface::doConnect()
if (m_tryReconnect)
{
INFO_LOG() << "Try reconnect to host: " << m_hostName
INFO_LOG(m_logger) << "Try reconnect to host: " << m_hostName
<< " port: " << m_hostPort
<< " ip-address: " << m_ipAddressDNS;
@@ -78,12 +77,12 @@ void AvsInterface::start(const QString &hostName, quint16 port)
const QList<QHostAddress> ipList = hostInfo.addresses();
if (ipList.isEmpty())
{
ERROR_LOG() << "Non ip-address found for hostname: " << hostName;
ERROR_LOG(m_logger) << "Non ip-address found for hostname: " << hostName;
m_ipAddressDNS.clear();
}
else
{
INFO_LOG() << "Try connect to AVS: " << hostName
INFO_LOG(m_logger) << "Try connect to AVS: " << hostName
<< " port: " << port
<< " ip-address: " << ipList.at(0).toString();
@@ -97,7 +96,7 @@ void AvsInterface::start(const QString &hostName, quint16 port)
void AvsInterface::onConnected()
{
INFO_LOG() << "Connected to "
INFO_LOG(m_logger) << "Connected to "
<< m_socket->peerAddress().toString()
<< ":" << m_socket->peerPort();
m_waitTime = 1;
@@ -112,7 +111,7 @@ void AvsInterface::onConnected()
void AvsInterface::onDisonnected()
{
INFO_LOG() << "Disconnected from " << m_socket->peerAddress().toString()
INFO_LOG(m_logger) << "Disconnected from " << m_socket->peerAddress().toString()
<< ":" << m_socket->peerPort();
m_avsKeepAliveTimer->stop();
@@ -125,7 +124,7 @@ void AvsInterface::onError(QAbstractSocket::SocketError err)
{
if (m_enableTryReconnect)
{
ERROR_LOG() << "Socket error: " << err
ERROR_LOG(m_logger) << "Socket error: " << err
<< " \"" << m_socket->errorString() << "\""
<< " Hostname: " << m_hostName
<< " Port:" << m_hostPort
@@ -134,7 +133,7 @@ void AvsInterface::onError(QAbstractSocket::SocketError err)
}
else
{
ERROR_LOG() << "Socket error: " << err
ERROR_LOG(m_logger) << "Socket error: " << err
<< " \"" << m_socket->errorString() << "\""
<< " Hostname: " << m_hostName
<< " Port:" << m_hostPort
@@ -179,7 +178,7 @@ void AvsInterface::onReadyRead()
if (data.isEmpty())
continue;
INFO_LOG() << "Incoming RCP_AVA: '" << data << "'";
INFO_LOG(m_logger) << "Incoming RCP_AVA: '" << data << "'";
int cmdNr = -1;
bool bOk = false;
@@ -236,11 +235,11 @@ bool AvsInterface::sendCommand(const QByteArray &qba)
{
bool bOk = true;
INFO_LOG() << "Send command: " << qba.trimmed();
INFO_LOG(m_logger) << "Send command: " << qba.trimmed();
if (m_socket->state() != QTcpSocket::ConnectedState)
{
ERROR_LOG() << "sendCommand()"
ERROR_LOG(m_logger) << "sendCommand()"
<< " '" << qba.trimmed()
<< "' No socket connection established.";
return false;
@@ -251,7 +250,7 @@ bool AvsInterface::sendCommand(const QByteArray &qba)
if (trxBytes != qba.size())
{
bOk = false;
ERROR_LOG() << "Insufficient number of tansfered bytes."
ERROR_LOG(m_logger) << "Insufficient number of tansfered bytes."
<< " Soll: " << trxBytes << " Ist: " << qba.size();
}
m_socket->flush();