torstenandCopilot
b774f4035c
- NGL_ADD_LIBRARY2: 87 CMakeLists.txt konvertiert für Export-Header Generierung - 44 Export-Header Include-Pfade korrigiert (_export.h) - 81 DDS-Stub-Header generiert (*_dtc.h, *_fts.h, *_dts.h, *_ftc.h) - INGLLogger: Duplikat gelöscht, m_logger Member entfernt, variadische Makros - Q_FUNC_INFO Redefinition behoben (Qt6 definiert bereits) - FATAL_LOG Makro hinzugefügt - InfrastructureManagement DDS-Stubs (ism.hpp, ism_enums.hpp, ism_ftc.h) - FilterManagement DDS-Stubs (flt_ftc.h, flt_dts.h) - AreaEffectSimulation DDS-Stubs (aes.hpp, aes_enums.hpp) - SymbolAppearance Klasse vollständig definiert mit content() Methode - BuildingComponentFilter Klasse definiert mit Copy-Konstruktor - Ftc Factory: nullptr Return (abstract class) - AesFilter Klasse in aes.hpp hinzugefügt - Dtc Klasse in ppm.hpp mit participantChanged Signal - AesType Enum: alle 15 At* Werte definiert - AesEffectState_def: EsReceived hinzugefügt - DataModification Enum: eAdded/eModified/eRemoved - function_reply_object.h → core_types.h Include-Pfad (72 Dateien) - Enum-Class-Streaming Template-Operator in INGLLogger.h - ism_mounting_point.h: QImage → QtGui/QImage, QGuiApplication/QScreen - ism_data_plugin_interface.h: QSet Include, Include-Reihenfolge - QRegExp → QRegularExpression in tpm_js_parser.cpp - .underlying() Aufrufe zu direktem Enum-Vergleich korrigiert - Include-Pfade: aes.hpp in symbol_appearance_settings_impl.h und aes_display_filter_impl.h Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
88 lines
2.2 KiB
C++
Executable File
88 lines
2.2 KiB
C++
Executable File
/**
|
|
* Communication with A/V system - fm server
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <QObject>
|
|
#include <QTimer>
|
|
#include <QTcpSocket>
|
|
#include <queue>
|
|
|
|
#include "logger.h"
|
|
#include "svcavmcommon_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_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
|