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>
104 lines
3.1 KiB
C++
104 lines
3.1 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
* AvaState
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by Christian Fröbel, SLSE, 2017-07-24
|
|
*/
|
|
|
|
#include "ava_state.h"
|
|
#include "ava_session.h"
|
|
#include "ava_control.h"
|
|
#include "av_helper.h"
|
|
#include "iava_comm.h"
|
|
#include <QtGlobal>
|
|
#include <algorithm>
|
|
#include <iterator>
|
|
|
|
namespace AudioVideoManagement
|
|
{
|
|
|
|
AvaState::AvaState(AvaSession *session)
|
|
// : m_session(session)
|
|
{
|
|
Q_ASSERT(session);
|
|
|
|
connect(session, &AvaSession::sessionEstablished, this, &AvaState::onSessionEstablished);
|
|
connect(session, &AvaSession::disconnected, this, &AvaState::onDisconnected);
|
|
|
|
IAvaComm *comm = session->control()->comm();
|
|
connect(comm, &IAvaComm::streamStateReceived, this, &AvaState::onStreamStateReceived);
|
|
connect(comm, &IAvaComm::sumChannelStateReceived, this, &AvaState::onSumChannelStateReceived);
|
|
connect(comm, &IAvaComm::rtChoiceUnitStateReceived, this, &AvaState::onRtChoiceUnitStateReceived);
|
|
connect(comm, &IAvaComm::rtVolumeUserReceived, this, &AvaState::onRtVolumeUserReceived);
|
|
|
|
if (session->isEstablished())
|
|
onSessionEstablished();
|
|
}
|
|
|
|
QStringList AvaState::currentLiveVideoStreams() const
|
|
{
|
|
QStringList streams;
|
|
for (const QMap<QString, AvaStreamState> &map : qAsConst(m_videoState))
|
|
{
|
|
const QList<QString> streamNames = map.keys();
|
|
for (const QString &streamName : streamNames)
|
|
{
|
|
std::pair<AvaStreamSource, QString> extracted = extractStreamSource(streamName);
|
|
if (extracted.first == AvaStreamSource::Interface)
|
|
streams.append(extracted.second);
|
|
}
|
|
}
|
|
|
|
return streams;
|
|
}
|
|
|
|
QStringList AvaState::getRtProfile() const
|
|
{
|
|
const std::vector<std::string> selectedCircuits = m_rtState.selectedRadioCircuits();
|
|
QStringList profile;
|
|
profile.reserve(selectedCircuits.size());
|
|
std::transform(selectedCircuits.begin(), selectedCircuits.end(), std::back_inserter(profile), &QString::fromStdString);
|
|
return profile;
|
|
}
|
|
|
|
void AvaState::onDisconnected()
|
|
{
|
|
m_videoState.clear();
|
|
}
|
|
|
|
void AvaState::onSessionEstablished()
|
|
{
|
|
// possibly actively query the stream list...
|
|
// m_session->control()->getStreamList(AvaStreamType::Video, AvaStreamSource::Interface);
|
|
// m_session->control()->getStreamList(AvaStreamType::Video, AvaStreamSource::Server);
|
|
// m_session->control()->getStreamList(AvaStreamType::Video, AvaStreamSource::Local);
|
|
}
|
|
|
|
void AvaState::onStreamStateReceived(const QString &dialogId, const QString &streamName, AvaStreamState streamState)
|
|
{
|
|
// How can I tell whether it's a video or audio stream?
|
|
if (streamState == AvaStreamState::NotPossible)
|
|
m_videoState[dialogId].remove(streamName);
|
|
else
|
|
m_videoState[dialogId][streamName] = streamState;
|
|
}
|
|
|
|
void AvaState::onSumChannelStateReceived(AvaSumChannel sumChannel)
|
|
{
|
|
m_rtState.setSumChannel(sumChannel);
|
|
}
|
|
|
|
void AvaState::onRtChoiceUnitStateReceived(AvaRtPos pos, const QString &streamName, AvaRtButtonState buttonState)
|
|
{
|
|
m_rtState.setSelection(pos, streamName.toStdString(), buttonState);
|
|
}
|
|
|
|
void AvaState::onRtVolumeUserReceived(const QString &streamName, AvaVolume volume)
|
|
{
|
|
m_rtState.setVolume(streamName.toStdString(), volume);
|
|
}
|
|
|
|
} // namespace AudioVideoManagement
|