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>
94 lines
2.4 KiB
C++
94 lines
2.4 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
* StreamNameMapping
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by Christian Fröbel, NLSE, 2018-03-12
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include "avm_export.h"
|
|
#include <QObject>
|
|
#include <QString>
|
|
#include <QRegExp>
|
|
#include <cstdint>
|
|
#include <map>
|
|
#include <vector>
|
|
|
|
|
|
enum class DataModification;
|
|
|
|
|
|
namespace AudioVideoManagement
|
|
{
|
|
|
|
namespace Interface
|
|
{
|
|
class Dtc;
|
|
}
|
|
|
|
class StreamName;
|
|
|
|
/**
|
|
* In AVS, the names of audio and video streams need to be unique within a given exercise.
|
|
* As the stream name used internally by AVS is not necessarily what the user wants
|
|
* to see in the GUI, we define a mapping from internalName to displayName.
|
|
*
|
|
* The internalName is assigned by the AVM Service. Here, the stream name will probably
|
|
* contain the MountingPoint-Id.
|
|
* The displayName is determined by properties of the MountingPoint.
|
|
*
|
|
* For each MountingPoint the AVS service will publish the corresponding internal-
|
|
* and displayName and thus serves as the source of this mapping.
|
|
*
|
|
* @author Christian Fröbel
|
|
*/
|
|
class AVM_COMMON_EXPORT StreamNameMapping : public QObject
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
struct Names
|
|
{
|
|
QString internal;
|
|
QString display;
|
|
};
|
|
|
|
/**
|
|
* Don't use directly, use create() instead.
|
|
* Only provided for UnitTests.
|
|
*/
|
|
StreamNameMapping() = default;
|
|
|
|
static StreamNameMapping *create(Interface::Dtc *dtc);
|
|
|
|
QString internalName(int32_t mountingPointId) const;
|
|
QString internalName(const QString &displayName);
|
|
|
|
QString displayName(int32_t mountingPointId) const;
|
|
|
|
/** The internalName might contain a source specifier "(S)" or "(L)" at the end. */
|
|
QString displayName(const QString &internalName) const;
|
|
|
|
std::vector<Names> allNames() const;
|
|
|
|
signals:
|
|
void changed(int32_t mountingPointId, const QString &internalName, const QString &displayName);
|
|
|
|
private slots:
|
|
void onStreamNameChanged(const StreamName &streamName, DataModification modType);
|
|
|
|
private:
|
|
void define(int32_t mountingPointId, const Names &names);
|
|
void remove(int32_t mountingPointId);
|
|
|
|
/** Used to extract the effective streamName if it contains a source specifier "(S)" or "(L)". */
|
|
const QRegExp m_extractor{QStringLiteral("(.*)(\\([SL]\\))"), Qt::CaseInsensitive};
|
|
std::map<int32_t, Names> m_mpToNames; //!< MountingPoint-Id -> internal AVS name
|
|
std::map<QString, QString> m_internalToDisplay;
|
|
};
|
|
|
|
} // namespace AudioVideoManagement
|