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>
101 lines
2.3 KiB
C++
101 lines
2.3 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
* AvsCommandQueue
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by Christian Fröbel, NLSE, 2018-02-23
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include "logger.h"
|
|
#include "avm_export.h"
|
|
#include <QObject>
|
|
#include <QTimer>
|
|
#include <deque>
|
|
#include <memory>
|
|
#include <chrono>
|
|
|
|
|
|
namespace LtsUtils
|
|
{
|
|
class IConnection;
|
|
}
|
|
|
|
namespace AudioVideoManagement
|
|
{
|
|
|
|
class ICommand;
|
|
|
|
/**
|
|
* CommandQueue used by AvaControl and VdControl.
|
|
* The CommandQueue ensures that each command is sent after the previous command finished.
|
|
* When a command is not finished within a defined time frame timeout() is signalled.
|
|
*
|
|
* @author Christian Fröbel
|
|
*/
|
|
class AVM_COMMON_EXPORT AvsCommandQueue : public QObject
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
/**
|
|
* @param timeout Timeout within which each command must be completed. Use 0 to disable the timeout.
|
|
*/
|
|
explicit AvsCommandQueue(std::chrono::milliseconds timeout);
|
|
~AvsCommandQueue() override;
|
|
|
|
void queue(std::unique_ptr<ICommand> cmd, std::unique_ptr<LtsUtils::IConnection> connection);
|
|
void done();
|
|
|
|
ICommand *currentCommand() const;
|
|
bool currentHasConnection() const;
|
|
LtsUtils::IConnection *currentConnection() const;
|
|
|
|
void flush();
|
|
|
|
/**
|
|
* Tell the Queue that the current command is still alive.
|
|
* Internal Timeout timer will be reset.
|
|
*/
|
|
void alive();
|
|
|
|
bool isEmpty() const { return m_queue.empty(); }
|
|
|
|
signals:
|
|
/**
|
|
* Signalled whenever the queue is empty again. This can have several reasons:
|
|
* - The last command finished successfully.
|
|
* - flush() was called while commands are pending.
|
|
* - This instance is deleted with pending commands which get flushed then.
|
|
*/
|
|
void queueEmpty();
|
|
|
|
/** Signalled if the current command did not finish within the defined time frame. */
|
|
void timeout();
|
|
|
|
private:
|
|
void nextCommand();
|
|
void tryReduce();
|
|
|
|
private:
|
|
/**
|
|
* Associates a command with a Qt-connection (signal-signal or signal-slot).
|
|
* In a scenario where multiple clients use an AvaControl instance
|
|
* this makes it possible to give the asynchronous response only
|
|
* to the initiator of the command.
|
|
*/
|
|
struct CommandWithConn
|
|
{
|
|
std::unique_ptr<ICommand> cmd;
|
|
std::unique_ptr<LtsUtils::IConnection> connection;
|
|
};
|
|
|
|
std::deque<CommandWithConn> m_queue;
|
|
QTimer m_timer;
|
|
LOGGER_T m_logger;
|
|
};
|
|
|
|
} // namespace AudioVideoManagement
|