torstenandCopilot
7173785915
Major Changes:
- Merged latest Qt5 devel content from dlbo (292 files changed, 7 new dirs)
- Consolidated forward-declarations and include folders
- Removed unneeded modules per Niklas' repo check list
Build System Fixes:
- Fixed CMake VERSION_GREATER syntax in ParticipantManagement/CMakeLists.txt
- Added VLC packages (libvlc-dev, vlc-plugin-base) to docker_build.sh
- Added PostgreSQL dev packages (libpq-dev, postgresql-server-dev-all) to Dockerfile
- Fixed locale warnings (ANSI_X3.4-1968 → C.UTF-8)
- Fixed ArcGIS SDK path warnings when BUILD_ARCGIS=OFF
Code Generation Fixes:
- Fixed IDL enum collisions (PortType→CorePortType/DdsutPortType, PdmEventType)
- Fixed Grantlee template svc_translation.cpp.grantlee:
- Changed {{ idl_enum.name }}_def:: to {{ idl_enum.name }}::
- Fixed .underlying() calls for C++11 scoped enums (enum class)
- Removed generated files from repo (moc_*, *_dtc.h, *_ftc.h)
Validation:
- BUILD_RTI=ON: SUCCESS
- BUILD_RTI=OFF: SUCCESS
- C++17 standard maintained for RTI 7.7 compatibility
- Ubuntu 26.04 Docker environment verified
Remaining Warnings (expected):
- BgViewer, KDChart, KDReports, Poppler-Qt6 not found (optional features)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
89 lines
2.2 KiB
C++
89 lines
2.2 KiB
C++
/**
|
|
* Communication with A/V system - fm server
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <QObject>
|
|
#include <QTimer>
|
|
#include <QTcpSocket>
|
|
#include <queue>
|
|
|
|
#include "logger.h"
|
|
#include "avm_export.h"
|
|
|
|
namespace AudioVideoManagement
|
|
{
|
|
class AVM_COMMON_EXPORT AVSocket : public QObject
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
AVSocket(const QString &avsServerHost,
|
|
quint16 avsServerPort,
|
|
NGL::INGLLogger &logger,
|
|
NGL::INGLLogger &loggerIO,
|
|
QObject *parent = nullptr);
|
|
~AVSocket();
|
|
|
|
void connectToAVS() { onConnectToAVS(); }
|
|
|
|
// From TcpServer::Workerbase to properly parse quoted arguments
|
|
// cfroebel 2017-06-19: Made it static public in order to unit-test it.
|
|
static QVector<QByteArray> parseLine(const QByteArray &ba, const int iStart = 0);
|
|
|
|
protected Q_SLOTS:
|
|
virtual void onDisconnected();
|
|
void onError(QAbstractSocket::SocketError error);
|
|
virtual void onReadyRead() = 0;
|
|
void onConnectToAVS();
|
|
void onRcpLogin();
|
|
|
|
protected:
|
|
QString getConnectionString() const;
|
|
bool sendInternal(const QByteArray &cmd);
|
|
|
|
protected:
|
|
bool m_bSuccessfullyLoggedIn;
|
|
bool m_bErrorInTcpComWarnedOnce;
|
|
QTcpSocket *m_avsSocket; //!< Will be deleted and re-created with every new connection.
|
|
QString m_avsServerHost;
|
|
quint16 m_avsServerPort;
|
|
QTimer *m_rcpLoginTimer;
|
|
QTimer *m_reconnectTimer;
|
|
std::queue<QByteArray> m_commandQueueForErrorHandling;
|
|
NGL::INGLLogger &m_logger;
|
|
NGL::INGLLogger &m_loggerIO;
|
|
};
|
|
|
|
|
|
/**
|
|
* Small wrapper around AVSocket in order to avoid that clients need to derive from it.
|
|
*/
|
|
class AVM_COMMON_EXPORT AVSocketWrapper : public AVSocket
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
AVSocketWrapper(const QString &avsServerHost, quint16 avsServerPort, NGL::INGLLogger &logger, NGL::INGLLogger &loggerIO)
|
|
: AVSocket(avsServerHost, avsServerPort, logger, loggerIO)
|
|
{}
|
|
|
|
void send(const QByteArray &cmd) { sendInternal(cmd); }
|
|
void disconnectFromHost() { m_avsSocket->disconnectFromHost(); }
|
|
|
|
signals:
|
|
void disconnected();
|
|
void readyRead(QTcpSocket *socket);
|
|
|
|
private:
|
|
void onDisconnected() override { AVSocket::onDisconnected(); emit disconnected(); }
|
|
void onReadyRead() override { emit readyRead(m_avsSocket); }
|
|
};
|
|
|
|
|
|
} // namespace AudioVideoManagement
|