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>
75 lines
1.6 KiB
C++
75 lines
1.6 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
* SimpleCommand
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by Christian Fröbel, SLSE, 2017-07-11
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include "icommand.h"
|
|
#include <functional>
|
|
|
|
namespace AudioVideoManagement
|
|
{
|
|
|
|
class IAvaComm;
|
|
class IAvaCommandDoneObserver;
|
|
class IVdComm;
|
|
class IVdCommandDoneObserver;
|
|
|
|
namespace detail
|
|
{
|
|
|
|
/**
|
|
* A SimpleCommand synchronises only with the OK response sent by the AVS.
|
|
* In order to invoke the actual command, a function object needs to be supplied
|
|
* which then calls the corresponding method on AvaComm or VdComm.
|
|
*
|
|
* @author Christian Fröbel
|
|
*/
|
|
template<class Comm, class DoneObserver>
|
|
class SimpleCommand : public ICommand
|
|
{
|
|
public:
|
|
/**
|
|
* The AVS responds to some commands with more than one OK. In that case
|
|
* the number of expected OK-responses can be specified.
|
|
*/
|
|
SimpleCommand(const QString &commandDesc, Comm *comm, DoneObserver *observer, std::function<void (Comm *)> commandInvoker, int okCount = 1);
|
|
QString debug() const override { return m_commandDesc; }
|
|
|
|
void send() override;
|
|
|
|
private slots:
|
|
void onOk();
|
|
|
|
private:
|
|
void done();
|
|
|
|
std::function<void (Comm *)> m_commandInvoker;
|
|
const int m_expectedOkCount;
|
|
int m_okCount{0};
|
|
Comm *m_comm;
|
|
DoneObserver *m_observer;
|
|
QString m_commandDesc;
|
|
};
|
|
|
|
} // namespace detail
|
|
|
|
|
|
namespace AvaCommands
|
|
{
|
|
using SimpleCommand = detail::SimpleCommand<IAvaComm, IAvaCommandDoneObserver>;
|
|
}
|
|
|
|
|
|
namespace VdCommands
|
|
{
|
|
using SimpleCommand = detail::SimpleCommand<IVdComm, IVdCommandDoneObserver>;
|
|
}
|
|
|
|
} // namespace AudioVideoManagement
|