Qt6 Migration: DDS-Stubs, Logger-Fixes, Export-Header Korrekturen

- 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>
This commit is contained in:
torstenandCopilot committed 2026-08-19 06:06:24 +02:00
1 parent 010f91928a
commit b774f4035c
2785 files changed
+18754 -18316

No files matched your search

@@ -30,7 +30,6 @@ AvailStreamsModel::AvailStreamsModel(Interface::Dtc *avmDtc,
, m_cnrRoot(new NGLTreeItem(QVariant()))
, m_tvcRoot(new NGLTreeItem(QVariant()))
, m_changes(false)
, m_logger(getLogger("AudioSettingsAvailStreamsModel"))
{
Q_ASSERT(avmDtc);
@@ -110,7 +109,7 @@ QVariant AvailStreamsModel::data(const QModelIndex &index, int role) const
{
NGLTreeItem *item = privateData(index);
StreamData data = item->data().value<StreamData>();
DEBUG_LOG(m_logger) << data.name;
DEBUG_LOG() << data.name;
return data.name;
}
@@ -54,8 +54,6 @@ private:
NGLTreeItem *m_tvcRoot;
bool m_changes;
QVector<QPair<bool , int> > m_changedStreams;
NGL::INGLLogger &m_logger;
};
class AvailStreamsFilter final : public QSortFilterProxyModel
@@ -18,7 +18,6 @@ AudioSettingsDialog::AudioSettingsDialog(QWidget *parent)
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel)
, m_ui(new Ui::AudioSettingsDialog)
, m_requestHelper(new LtsUtils::RequestHelper(this))
, m_logger(getLogger("AudioSettingsDialog"))
{
m_ui->setupUi(this);
setAttribute(Qt::WA_DeleteOnClose);
@@ -123,7 +122,7 @@ void AudioSettingsDialog::retranslate()
void AudioSettingsDialog::onOperatorChanged(const OperatorManagement::User &data, DataModification modType)
{
DEBUG_LOG(m_logger) << "************** onOperatorChanged ";
DEBUG_LOG() << "************** onOperatorChanged ";
switch (modType)
{
case DataModification::eRemoved:
@@ -246,7 +245,7 @@ void AudioSettingsDialog::onDownButtonClicked()
void AudioSettingsDialog::onSelectionChangedAllocation(const QItemSelection &selected, const QItemSelection &deselected)
{
DEBUG_LOG(m_logger) << "onSelectionChangedAllocation selected.isEmpty()=" << selected.isEmpty();
DEBUG_LOG() << "onSelectionChangedAllocation selected.isEmpty()=" << selected.isEmpty();
Q_UNUSED(deselected);
QModelIndex first = m_ui->treeViewAllocated->model()->index(0, 0);
int rowCnt = m_ui->treeViewAllocated->model()->rowCount();
@@ -282,7 +281,7 @@ bool AudioSettingsDialog::apply()
bool AudioSettingsDialog::applyRemove()
{
RemoveCnrTvcProfileRequest removeRequest;
DEBUG_LOG(m_logger) << "AudioSettingsDialog::applyRemove";
DEBUG_LOG() << "AudioSettingsDialog::applyRemove";
for (const auto &profile : std::as_const(m_cnrTvcProfileMap))
{
@@ -305,7 +304,7 @@ bool AudioSettingsDialog::applyRemove()
bool AudioSettingsDialog::applyModify()
{
ModifyCnrTvcProfileRequest modifyRequest;
DEBUG_LOG(m_logger) << "AudioSettingsDialog::applyModify";
DEBUG_LOG() << "AudioSettingsDialog::applyModify";
for (const auto &profile : std::as_const(m_cnrTvcProfileMap))
{
@@ -383,7 +382,7 @@ void AudioSettingsDialog::onSelectionOperatorChanged(const int index)
m_ui->pushButtonUp->setEnabled(false);
m_ui->pushButtonDown->setEnabled(false);
m_operatorId = m_ui->operatorComboBox->currentData().toInt();
DEBUG_LOG(m_logger) << "onSelectionOperatorChanged" << " operatorStr=" << m_ui->operatorComboBox->currentText() << " m_operatorId= " << m_operatorId;
DEBUG_LOG() << "onSelectionOperatorChanged" << " operatorStr=" << m_ui->operatorComboBox->currentText() << " m_operatorId= " << m_operatorId;
fillOperatorList();
m_modelAllocated->resetChangeState();
m_modelAvailable->resetChangeState();
@@ -14,7 +14,6 @@ namespace AudioVideoManagement
AllocatedStreamsModel::AllocatedStreamsModel(QObject *parent)
: NGLTreeModel(parent, new NGLTreeItem(QVariant(QLatin1String("root"))), { tr("Allocated") })
, m_logger(getLogger("AudioSettingsUsedStreamsModel"))
{
setMimeType(StreamData::mimeType());
}
@@ -32,7 +31,7 @@ QVariant AllocatedStreamsModel::data(const QModelIndex &index, int role) const
{
NGLTreeItem *item = privateData(index);
StreamData data = item->data().value<StreamData>();
DEBUG_LOG(m_logger) << data.name;
DEBUG_LOG() << data.name;
return data.name;
}
@@ -93,14 +92,14 @@ bool AllocatedStreamsModel::dropMimeData(const QMimeData *data, Qt::DropAction a
qDeleteAll(droppedItems);
emit droppedStreamNames(streams);
m_changes = true;
DEBUG_LOG(m_logger) << data->data(QStringLiteral("NGLTreeModel/dragDrop"));
DEBUG_LOG() << data->data(QStringLiteral("NGLTreeModel/dragDrop"));
return NGLTreeModel::dropMimeData(data, action, row, 0, QModelIndex());
}
void AllocatedStreamsModel::setNewStreamData(const QVector<StreamData> &newData)
{
DEBUG_LOG(m_logger) << "set new stream data, count: " << newData.size();
DEBUG_LOG() << "set new stream data, count: " << newData.size();
resetModel();
for (const StreamData &sd : newData)
m_rootItem->appendChild(new NGLTreeItem(QVariant::fromValue(sd)));
@@ -117,15 +116,15 @@ QVector<StreamData> AllocatedStreamsModel::getStreamDataVector() const
const NGLTreeItem *item = m_rootItem->child(i);
const StreamData sd = item->data().value<StreamData>();
result.append(sd);
DEBUG_LOG(m_logger) << "result.append(sd.name):" << sd.name;
DEBUG_LOG() << "result.append(sd.name):" << sd.name;
}
DEBUG_LOG(m_logger) << "getStreamDataVector() size: " << result.size();
DEBUG_LOG() << "getStreamDataVector() size: " << result.size();
return result;
}
void AllocatedStreamsModel::changeOrder(const QModelIndex &idx, bool up)
{
DEBUG_LOG(m_logger) << "changeOrder "
DEBUG_LOG() << "changeOrder "
<< " index = " << idx.row()
<< " up = " << up
<< " m_rootItem->childCount()= " << m_rootItem->childCount();
@@ -42,7 +42,6 @@ signals:
private:
bool m_changes{false};
QVector<QPair<bool , int> > m_changedStreams;
NGL::INGLLogger &m_logger;
};
}
@@ -22,7 +22,6 @@ AvmSequenceModel::AvmSequenceModel(QObject *parent)
tr("Volume"),
tr("Description")},
parent)
, m_logger(getLogger("AvmSequenceModel"))
{}
void AvmSequenceModel::setTimezoneHoursOffset(int timezoneHoursOffset)
@@ -63,7 +63,6 @@ private:
QVector<int> m_highlightedRows;
int m_timezoneHoursOffset = 0;
LOGGER_T m_logger;
};
class AvmSequenceProxyModel final : public LtsWidgets::LtsColumnFilterProxyModel
@@ -62,7 +62,6 @@ TopicEditor::TopicEditor(LtsSession::LtsSession *session, const TopicEditorBase:
, m_model(new AvmSequenceModel(this))
, m_playbackMenu(nullptr)
, m_ui(new Ui::AVTopicEditor)
, m_logger(getLogger("TopicEditor"))
{
Q_ASSERT(session);
@@ -380,7 +379,7 @@ void TopicEditor::onEditSequence()
if (!m_playbackMenu)
return;
DEBUG_LOG(m_logger) << "slotEditSequence ";
DEBUG_LOG() << "slotEditSequence ";
const auto selRows = m_ui->tvSequences->selectionModel()->selectedRows();
if (selRows.size() != 1)
@@ -393,7 +392,7 @@ void TopicEditor::onEditSequence()
m_model->setHighlightedRow(row);
const AvsSequence selectedSeq = m_model->getRowData(row);
DEBUG_LOG(m_logger) << "selectedSeq.internalStreamName=" << selectedSeq.internalStreamName;
DEBUG_LOG() << "selectedSeq.internalStreamName=" << selectedSeq.internalStreamName;
m_playbackMenu->setStreamName(selectedSeq.internalStreamName);
m_ui->dtStart->setMsecsSinceEpoch(std::chrono::milliseconds(selectedSeq.start.time_since_epoch()).count());
@@ -67,7 +67,6 @@ private:
QString m_topicStreamName;
Ui::AVTopicEditor *m_ui{nullptr};
NGL::INGLLogger &m_logger;
};
}
@@ -64,7 +64,6 @@ AvailableStreamsModel::AvailableStreamsModel(const std::shared_ptr<Interface::Dt
, m_ismDtc(ismDtc)
, m_session(session)
, m_streamNameMapping(streamNameMapping)
, m_logger(getLogger("AvailableStreamsModel"))
{
Q_ASSERT(ismDtc);
Q_ASSERT(streamNameMapping);
@@ -165,7 +164,7 @@ QMimeData *AvailableStreamsModel::mimeData(const QModelIndexList &indexes) const
bool AvailableStreamsModel::dropMimeData(const QMimeData *data, Qt::DropAction action,
int row, int column, const QModelIndex &parent)
{
INFO_LOG(m_logger) << "dropMimeData: action = " << action
INFO_LOG() << "dropMimeData: action = " << action
<< ", row = " << row
<< ", parent: valid = " << parent.isValid();
@@ -185,7 +184,7 @@ bool AvailableStreamsModel::dropMimeData(const QMimeData *data, Qt::DropAction a
void AvailableStreamsModel::initModel()
{
beginResetModel();
INFO_LOG(m_logger) << "initModel";
INFO_LOG() << "initModel";
m_rootItem->removeAllChildren();
@@ -251,7 +250,7 @@ void AvailableStreamsModel::initModel()
{
if (videoTeam.exerciseId() != m_session->exerciseId())
continue;
DEBUG_LOG(m_logger) << "add new videoteam" << videoTeam;
DEBUG_LOG() << "add new videoteam" << videoTeam;
StreamModelData item;
item.name = QString::fromStdString(videoTeam.streamName().c_str());
item.mountingPointId = -1 * videoTeam.id();
@@ -96,8 +96,6 @@ private:
const std::shared_ptr<InfrastructureManagement::Interface::Dtc> m_ismDtc;
LtsSession::LtsSession *m_session;
StreamNameMapping *m_streamNameMapping;
NGL::INGLLogger &m_logger;
};
}
Q_DECLARE_METATYPE(AudioVideoManagement::StreamModelData)
@@ -18,7 +18,6 @@ ChooseMenu::ChooseMenu(Interface::Dtc *dtc, AvsMenus *avsMenus, QWidget *parent)
, m_dtc(dtc)
, m_avsMenus(avsMenus)
, m_ui(new Ui::ChooseMenuStruct)
, m_logger(getLogger("ChooseMenu"))
{
Q_ASSERT(dtc);
Q_ASSERT(avsMenus);
@@ -86,11 +85,11 @@ void ChooseMenu::onMenuStructChanged(const MenuStruct &data, DataModification mo
bool ChooseMenu::apply()
{
int menuId = m_ui->cbAudio->currentData().toInt();
INFO_LOG(m_logger) << "MenuId Audio: " << menuId;
INFO_LOG() << "MenuId Audio: " << menuId;
m_avsMenus->setAnnouncementMenu(menuId);
menuId = m_ui->cbVideo->currentData().toInt();
INFO_LOG(m_logger) << "MenuId Video: " << menuId;
INFO_LOG() << "MenuId Video: " << menuId;
m_avsMenus->setVideoMenu(menuId);
return true;
@@ -50,7 +50,6 @@ private:
Interface::Dtc *m_dtc;
AvsMenus *m_avsMenus;
Ui::ChooseMenuStruct *m_ui;
NGL::INGLLogger &m_logger;
};
}
@@ -15,7 +15,6 @@ MenuEdit::MenuEdit(QWidget *parent)
, m_availStreamsModel(nullptr)
, m_usedStreamsModel(nullptr)
, m_isAudio(false)
, m_logger(getLogger("AudioVideoManagementEdit"))
, m_requestHelper(new LtsUtils::RequestHelper(this))
{
m_ui->setupUi(this);
@@ -47,11 +46,11 @@ bool MenuEdit::init(LtsSession::LtsSession *session,
StreamNameMapping *streamNameMapping,
const MenuStruct &ms)
{
DEBUG_LOG(m_logger) << "MenuEdit::init()";
DEBUG_LOG() << "MenuEdit::init()";
if (!ftc || !dtc)
{
ERROR_LOG(m_logger) << "MenuEdit::init() Invalid shared_ptr!";
ERROR_LOG() << "MenuEdit::init() Invalid shared_ptr!";
return false;
}
@@ -120,7 +119,7 @@ void MenuEdit::onRemove()
return;
slotChangesMade();
DEBUG_LOG(m_logger) << "index row: " << index.row();
DEBUG_LOG() << "index row: " << index.row();
m_usedStreamsModel->removeRow(index.row(), index.parent());
}
else
@@ -132,7 +131,7 @@ void MenuEdit::onRemove()
return;
slotChangesMade();
DEBUG_LOG(m_logger) << "index row: " << index.row();
DEBUG_LOG() << "index row: " << index.row();
m_usedStreamsModel->removeRow(index.row(), index.parent());
}
@@ -141,7 +140,7 @@ void MenuEdit::onRemove()
void MenuEdit::onModelDataChanged()
{
INFO_LOG(m_logger) << "onModelDataChanged";
INFO_LOG() << "onModelDataChanged";
m_ui->menuTreeView->expandAll();
}
@@ -68,7 +68,6 @@ private:
UsedStreamsModel *m_usedStreamsModel;
bool m_isAudio;
QString m_name;
NGL::INGLLogger &m_logger;
LtsUtils::RequestHelper *m_requestHelper;
AudioVideoManagement::MenuStruct m_lastDdsMenuStruct;
@@ -26,7 +26,6 @@ MenuEditView::MenuEditView(const QString &menuGroup, LtsSession::LtsSession *ses
, m_session(session)
, m_requestHelper(new LtsUtils::RequestHelper(this))
, m_ui(new Ui::MenuEditView)
, m_logger(getLogger("AudioVideoManagementDialog"))
{
m_ui->setupUi(this);
m_ui->widget->setSelectionMode(QAbstractItemView::SingleSelection);
@@ -150,7 +149,7 @@ void MenuEditView::onEditMenuStruct()
AudioVideoManagement::MenuStruct ms = m_model->getRowData(row);
ms.isAudio(m_isAudio);
DEBUG_LOG(m_logger) << "---onEditMenuStruct () "
DEBUG_LOG() << "---onEditMenuStruct () "
<< " id: " << ms.id()
<< " name: " << ms.name();
@@ -205,15 +204,15 @@ void MenuEditView::onExportButtonClicked()
int fileId = m_flmGui->saveFileContent(this, FileManagement::FileType::Xml, m_session->exerciseId(), byteArray);
if (fileId > 0)
DEBUG_LOG(m_logger) << "Saved file with id = " << fileId;
DEBUG_LOG() << "Saved file with id = " << fileId;
else
ERROR_LOG(m_logger) << "Could not save file in library ";
ERROR_LOG() << "Could not save file in library ";
}
void MenuEditView::onImportButtonClicked()
{
DEBUG_LOG(m_logger) << " onImportButtonClicked() ";
DEBUG_LOG() << " onImportButtonClicked() ";
QByteArray content;
int fileId = m_flmGui->loadFileContent(this, content, {FileManagement::FileType::Xml}, m_session->exerciseId(), FileManagement::toString(FileManagement::XmlType::AVMMenuEditView));
@@ -240,7 +239,7 @@ void MenuEditView::onImportButtonClicked()
});
}
}
INFO_LOG(m_logger) << "--- onImportButtonClicked() ";
INFO_LOG() << "--- onImportButtonClicked() ";
}
}
}
@@ -76,9 +76,6 @@ private:
LtsSession::LtsSession *m_session;
LtsUtils::RequestHelper *m_requestHelper;
Ui::MenuEditView *m_ui;
LOGGER_T m_logger;
};
}
@@ -21,7 +21,6 @@ MenuViewModel::MenuViewModel(QObject *parent)
parent)
, m_isAudio(false)
, m_dtc(nullptr)
, m_logger(getLogger("MenuViewModel"))
{}
@@ -78,7 +77,7 @@ QByteArray MenuViewModel::modelToJson(int row) const
QJsonObject obj;
obj[QStringLiteral("XmlType")] = FileManagement::toString(FileManagement::XmlType::AVMMenuEditView);
DEBUG_LOG(m_logger) << "row =" << ": " << row;
DEBUG_LOG() << "row =" << ": " << row;
const AudioVideoManagement::MenuStruct &menuStruct = m_vecData.at(row);
obj[QStringLiteral("id")] = 0;
@@ -123,7 +122,7 @@ QVector<AudioVideoManagement::MenuStruct> MenuViewModel::jsonToMenuStructs(const
const QJsonArray arrEntry(obj.value(QStringLiteral("menuEntries")).toArray());
menuStruct.menuEntries().resize(arrEntry.size());
INFO_LOG(m_logger) << "arrEntry.size()=" << arrEntry.size();
INFO_LOG() << "arrEntry.size()=" << arrEntry.size();
for (int j = 0; j < arrEntry.size(); ++j)
{
const QJsonObject objEntry(arrEntry.at(j).toObject());
@@ -30,6 +30,5 @@ protected:
private:
bool m_isAudio;
std::shared_ptr<AudioVideoManagement::Interface::Dtc> m_dtc;
LOGGER_T m_logger;
};
}
@@ -13,7 +13,6 @@ namespace AudioVideoManagement
NewMenuStruct::NewMenuStruct(QWidget *parent)
: LtsWidgets::LtsFramelessDialog(parent, LtsWidgets::Behaviour::Modal)
, m_ui(new Ui::NewMenuStruct)
, m_logger(getLogger("NewMenu"))
{
m_ui->setupUi(this);
m_ui->ltsDialogButtonBox->getButton(LtsWidgets::DialogButton::Ok)->hide();
@@ -30,7 +30,6 @@ Q_SIGNALS:
private:
Ui::NewMenuStruct *m_ui;
LOGGER_T m_logger;
};
}
@@ -296,7 +296,6 @@ AvmPlaybackMenu::AvmPlaybackMenu(QWidget *parent)
: QWidget(parent)
, m_ui(new Ui::Playback)
, m_requestHelper(new LtsUtils::RequestHelper(this))
, m_logger(getLogger("AvmPlaybackMenu"))
{}
@@ -388,12 +387,12 @@ bool AvmPlaybackMenu::init(LtsSession::LtsSession *session, AvaSession *avaSessi
m_presetStreamName = streamName;
if (m_presetStreamName)
DEBUG_LOG(m_logger) << "init stream preset: " << m_presetStreamName.get();
DEBUG_LOG() << "init stream preset: " << m_presetStreamName.get();
m_presetStartTime = startTime;
if (m_presetStartTime)
DEBUG_LOG(m_logger) << "init time preset: " << std::chrono::milliseconds(m_presetStartTime.get().time_since_epoch()).count();
DEBUG_LOG() << "init time preset: " << std::chrono::milliseconds(m_presetStartTime.get().time_since_epoch()).count();
m_session = session;
m_playbackApp = std::move(appHandle);
@@ -1007,37 +1006,37 @@ void AvmPlaybackMenu::preselectStream(const QString &fallbackInternalStreamName)
const QString currentStreamName(m_presetStreamName.is_initialized() ? *m_presetStreamName : QString());
const QString currentInternalName(currentStreamName.isEmpty() ? fallbackInternalStreamName : QString());
DEBUG_LOG(m_logger) << "currentStreamName: " << currentStreamName;
DEBUG_LOG(m_logger) << "currentInternalName: " << currentInternalName;
DEBUG_LOG() << "currentStreamName: " << currentStreamName;
DEBUG_LOG() << "currentInternalName: " << currentInternalName;
m_presetStreamName.reset();
if (!currentInternalName.isEmpty() || !currentStreamName.isEmpty())
{
DEBUG_LOG(m_logger) << "stream preset set - searching for '" << currentStreamName << "'..";
DEBUG_LOG() << "stream preset set - searching for '" << currentStreamName << "'..";
bool found = false;
for (int i = 0; i < m_ui->cbStreams->count(); i++)
{
const AvaStream &curStream = m_ui->cbStreams->itemData(i).value<AvaStream>();
DEBUG_LOG(m_logger) << "stream " << i << ": " << curStream.displayName << " (" << curStream.internalName << ")";
DEBUG_LOG() << "stream " << i << ": " << curStream.displayName << " (" << curStream.internalName << ")";
if ((!currentInternalName.isEmpty() && curStream.displayName == currentInternalName) ||
(!currentStreamName.isEmpty() && curStream.internalName == currentStreamName))
{
found = true;
DEBUG_LOG(m_logger) << "stream preset set, found & selected";
DEBUG_LOG() << "stream preset set, found & selected";
m_ui->cbStreams->setCurrentIndex(i);
break;
}
}
if (!found)
WARNING_LOG(m_logger) << "new stream list does not contain old selected stream (" << currentInternalName << ") !";
WARNING_LOG() << "new stream list does not contain old selected stream (" << currentInternalName << ") !";
}
else
DEBUG_LOG(m_logger) << "no stream preset set";
DEBUG_LOG() << "no stream preset set";
}
@@ -1098,7 +1097,7 @@ void AvmPlaybackMenu::setSavedPos(qint64 msecs)
void AvmPlaybackMenu::onTimelineComplete(const AvaTimeline &timeline)
{
DEBUG_LOG(m_logger) << "onTimelineComplete";
DEBUG_LOG() << "onTimelineComplete";
m_intervalModel.setData(timeline.parts());
m_ui->tavIntervals->resizeColumnsToContents();
@@ -1116,7 +1115,7 @@ void AvmPlaybackMenu::onTimelineComplete(const AvaTimeline &timeline)
m_savedPos.reset();
}
DEBUG_LOG(m_logger) << "onTimelineComplete " << std::chrono::milliseconds(newPos.time_since_epoch()).count();
DEBUG_LOG() << "onTimelineComplete " << std::chrono::milliseconds(newPos.time_since_epoch()).count();
m_avaCtrl->setAbsPosition(m_playbackApp.dialogId(), ALL_STREAMS(), newPos);
m_timelineIsComplete = true;
@@ -1143,7 +1142,7 @@ void AvmPlaybackMenu::onStreamPositionReceived(const QString &dialogId, const QS
return;
m_lastAvsPos = pos;
DEBUG_LOG(m_logger) << "onStreamPositionReceived: last avs pos now: " << std::chrono::milliseconds((*m_lastAvsPos).time_since_epoch()).count() << " - direct apply? " << m_avaCtrl->isEmpty();
DEBUG_LOG() << "onStreamPositionReceived: last avs pos now: " << std::chrono::milliseconds((*m_lastAvsPos).time_since_epoch()).count() << " - direct apply? " << m_avaCtrl->isEmpty();
if (m_avaCtrl->isEmpty())
applyAvsPos();
@@ -1199,13 +1198,13 @@ void AvmPlaybackMenu::onUiTimeChanged(AvaTimePoint t)
m_currentButtonState != ButtonStates::Stopped)
return;
DEBUG_LOG(m_logger) << "onUiTimeChanged " << std::chrono::milliseconds(t.time_since_epoch()).count();
DEBUG_LOG() << "onUiTimeChanged " << std::chrono::milliseconds(t.time_since_epoch()).count();
m_avaCtrl->setAbsPosition(m_playbackApp.dialogId(), ALL_STREAMS(), t);
}
void AvmPlaybackMenu::onStreamSelectionChanged(const QVector<AvaStream> &selectedStreams)
{
DEBUG_LOG(m_logger) << "onStreamSelectionChanged count = " << selectedStreams.count();
DEBUG_LOG() << "onStreamSelectionChanged count = " << selectedStreams.count();
Q_ASSERT(!selectedStreams.isEmpty());
@@ -1232,7 +1231,7 @@ void AvmPlaybackMenu::onStreamSelectionChanged(const QVector<AvaStream> &selecte
void AvmPlaybackMenu::onIntervalActivated(const QModelIndex &index)
{
AvaTimelinePart interval = m_intervalModel.getRowData(index.row());
DEBUG_LOG(m_logger) << "start = " << std::chrono::milliseconds(interval.first.time_since_epoch()).count();
DEBUG_LOG() << "start = " << std::chrono::milliseconds(interval.first.time_since_epoch()).count();
m_avaCtrl->setAbsPosition(m_playbackApp.dialogId(), ALL_STREAMS(), interval.first);
@@ -1303,7 +1302,7 @@ void AvmPlaybackMenu::selectMarker(const MarkerManagement::Marker &marker)
(void)blocker;
const auto &rowData = marker;
DEBUG_LOG(m_logger) << "AvmPlaybackMenu::onMarkerClicked name = " << QString::fromStdString(rowData.name())
DEBUG_LOG() << "AvmPlaybackMenu::onMarkerClicked name = " << QString::fromStdString(rowData.name())
<< " note = " << QString::fromStdString(rowData.note());
bool selectMarkerStream = false;
@@ -1320,7 +1319,7 @@ void AvmPlaybackMenu::selectMarker(const MarkerManagement::Marker &marker)
for (const MarkerManagement::MarkerDescription &desc : rowData.descriptions())
{
DEBUG_LOG(m_logger) << " description = " << QString::fromStdString(desc.content())
DEBUG_LOG() << " description = " << QString::fromStdString(desc.content())
<< " desc.markerType()=" << desc.markerType();
if ((desc.markerType() == MarkerManagement::MarkerType::Video && m_isAudio == false) ||
(desc.markerType() == MarkerManagement::MarkerType::Audio && m_isAudio == true))
@@ -1346,7 +1345,7 @@ void AvmPlaybackMenu::selectMarker(const MarkerManagement::Marker &marker)
avaStream.displayName = m_streamNameMapping->displayName(avaStream.internalName);
m_ui->cbMarkerStreams->addItem(avaStream.displayName, QVariant::fromValue(avaStream));
DEBUG_LOG(m_logger) << "streams[" << avaStream.internalName << "]"
DEBUG_LOG() << "streams[" << avaStream.internalName << "]"
<< " internaName=" << avaStream.internalName
<< " displayName=" << avaStream.displayName;
if (bIsSelected && selectedStream.internalName.isEmpty())
@@ -1364,7 +1363,7 @@ void AvmPlaybackMenu::selectMarker(const MarkerManagement::Marker &marker)
qint64 time = rowData.timeStamp() - rowData.timeStampOffset();
DEBUG_LOG(m_logger) << "marker time: " << time << " (" << QDateTime::fromMSecsSinceEpoch(time).toString(QStringLiteral("dd.MM.yy HH:mm:ss.zzz")) << ")";
DEBUG_LOG() << "marker time: " << time << " (" << QDateTime::fromMSecsSinceEpoch(time).toString(QStringLiteral("dd.MM.yy HH:mm:ss.zzz")) << ")";
std::chrono::milliseconds t(time);
AvaTimePoint p(std::chrono::duration_cast<AvaDuration>(t));
@@ -1404,7 +1403,7 @@ void AvmPlaybackMenu::onSetMarkerClicked()
if (!m_selectedStreams || m_selectedStreams.get().isEmpty())
{
new LtsWidgets::LtsMessageDialogNew(this, tr("No stream selected to create a marker from."));
WARNING_LOG(m_logger) << "onSetMarkerClicked called, but no selected streams available";
WARNING_LOG() << "onSetMarkerClicked called, but no selected streams available";
return;
}
@@ -1445,7 +1444,7 @@ void AvmPlaybackMenu::onStartClicked()
{
DEBUG_LOG(m_logger) << "onStartClicked"
DEBUG_LOG() << "onStartClicked"
<< " dialogId=" << m_playbackApp.dialogId()
<< " currentSpeed=" << currentSpeed()
@@ -1460,7 +1459,7 @@ void AvmPlaybackMenu::onStartClicked()
return;
}
WARNING_LOG(m_logger) << "onStartClicked called, but no selected streams available";
WARNING_LOG() << "onStartClicked called, but no selected streams available";
return;
}
@@ -1502,14 +1501,14 @@ void AvmPlaybackMenu::onAllStreams()
void AvmPlaybackMenu::onIntervalBackwardClicked()
{
const AvaTimelinePart &targetInterval = m_intervalModel.previousInterval();
DEBUG_LOG(m_logger) << "onIntervalBackwardClicked " << std::chrono::milliseconds(targetInterval.first.time_since_epoch()).count();
DEBUG_LOG() << "onIntervalBackwardClicked " << std::chrono::milliseconds(targetInterval.first.time_since_epoch()).count();
m_avaCtrl->setAbsPosition(m_playbackApp.dialogId(), ALL_STREAMS(), targetInterval.first);
}
void AvmPlaybackMenu::onIntervalForwardClicked()
{
const AvaTimelinePart &targetInterval = m_intervalModel.nextInterval();
DEBUG_LOG(m_logger) << "onIntervalForwardClicked " << std::chrono::milliseconds(targetInterval.first.time_since_epoch()).count();
DEBUG_LOG() << "onIntervalForwardClicked " << std::chrono::milliseconds(targetInterval.first.time_since_epoch()).count();
m_avaCtrl->setAbsPosition(m_playbackApp.dialogId(), ALL_STREAMS(), targetInterval.first);
}
@@ -210,8 +210,6 @@ private:
bool m_videoScreenSelectionDone { false };
bool m_timelineIsComplete { false };
ButtonStates m_buttonStateBeforePlaybackAppPause { ButtonStates::AllOff };
LOGGER_T m_logger;
};
}
@@ -23,7 +23,6 @@ UsedStreamsModel::UsedStreamsModel(const std::shared_ptr<Interface::Dtc> avmDtc,
, m_dummyId(-10000000)
, m_menuStruct(ms)
, m_streamNameMapping(streamNameMapping)
, m_logger(getLogger("UsedStreamsModel"))
{
Q_ASSERT(streamNameMapping);
@@ -130,7 +129,7 @@ bool UsedStreamsModel::dropMimeData(const QMimeData *data, Qt::DropAction action
if (!checkDrop(data, index(row, column), parent, action))
return false;
INFO_LOG(m_logger) << "dropMimeData: action = " << action
INFO_LOG() << "dropMimeData: action = " << action
<< ", row = " << row
<< ", parent: valid = " << parent.isValid();
@@ -201,7 +200,7 @@ bool UsedStreamsModel::canDropMimeData(const QMimeData *data, Qt::DropAction act
stream >> idParent >> idItem >> group >> itemData >> mountId;
ms = itemData.value<StreamModelData>();
INFO_LOG(m_logger) << "Insert:"
INFO_LOG() << "Insert:"
<< "\n ms.name=" << ms.name
<< "\n ms.isGroup=" << ms.isGroup
<< "\n ms.parentId=" << ms.parentId
@@ -302,7 +301,7 @@ void UsedStreamsModel::insertChildren(NGLTreeItem *parent, int parentId, const s
if (me.isGroup())
{
DEBUG_LOG(m_logger) << "insertChildren"
DEBUG_LOG() << "insertChildren"
<< me.mountingPointId()
<< me.name();
insertChildren(treeItem, me.id(), entries);
@@ -336,7 +335,7 @@ bool UsedStreamsModel::checkSingleItem(NGLTreeItem *target, StreamModelData &toC
bool retValue = true;
if (!target)
{
ERROR_LOG(m_logger) << "Nullptr exception";
ERROR_LOG() << "Nullptr exception";
return false;
}
else
@@ -344,10 +343,10 @@ bool UsedStreamsModel::checkSingleItem(NGLTreeItem *target, StreamModelData &toC
StreamModelData msTarget = target->data().value<StreamModelData>();
if (msTarget.id == toCheck.parentId)
DEBUG_LOG(m_logger) << "Drag&drag in same folder.";
DEBUG_LOG() << "Drag&drag in same folder.";
else if (msTarget.isGroup && toCheck.isGroup)
{
DEBUG_LOG(m_logger) << "Trying to drop folder into folder";
DEBUG_LOG() << "Trying to drop folder into folder";
retValue = false;
}
else
@@ -429,18 +428,18 @@ bool UsedStreamsModel::checkDrop(const QMimeData *data, const QModelIndex &index
else if ((movedFolders.at(0) != item.parentId) && (movedFolders.contains(item.parentId)) && (action == Qt::MoveAction))
{
DEBUG_LOG(m_logger) << "Ignoring items in sub folder while moving.";
DEBUG_LOG() << "Ignoring items in sub folder while moving.";
continue;
}
else if (!movedFolders.contains(item.parentId) && (action == Qt::MoveAction))
{
DEBUG_LOG(m_logger) << "Only allow items from same folder to be moved.";
DEBUG_LOG() << "Only allow items from same folder to be moved.";
return false;
}
if (!checkSingleItem(itemToCheck, item))
{
DEBUG_LOG(m_logger) << "Not able to add item with name: " << item.name;
DEBUG_LOG() << "Not able to add item with name: " << item.name;
return false;
}
@@ -453,7 +452,7 @@ bool UsedStreamsModel::checkDrop(const QMimeData *data, const QModelIndex &index
}
else
{
DEBUG_LOG(m_logger) << "More than one folder selected.";
DEBUG_LOG() << "More than one folder selected.";
return false;
}
}
@@ -464,7 +463,7 @@ bool UsedStreamsModel::checkDrop(const QMimeData *data, const QModelIndex &index
if (countDropped + countAgainst > 12)
{
DEBUG_LOG(m_logger) << "Trying to add to many items to folder";
DEBUG_LOG() << "Trying to add to many items to folder";
return false;
}
return true;
@@ -552,7 +551,7 @@ void UsedStreamsModel::onDataChanged(const InfrastructureManagement::MainStructu
const DataModification modType)
{
beginResetModel();
INFO_LOG(m_logger) << "onDataChanged m_rootItem->childCount()" << m_rootItem->childCount()
INFO_LOG() << "onDataChanged m_rootItem->childCount()" << m_rootItem->childCount()
<< " data.elements().size()=" << data.elements().size();
switch (modType)
@@ -563,7 +562,7 @@ void UsedStreamsModel::onDataChanged(const InfrastructureManagement::MainStructu
case DataModification::eAdded:
for (const InfrastructureManagement::StructureElement &se : data.elements())
{
INFO_LOG(m_logger) << "se.id()" << se.id()
INFO_LOG() << "se.id()" << se.id()
<< " se.displayName()" << se.displayName()
<< " m_rootItem->childCount()" << m_rootItem->childCount();
const QString newName = QString::fromStdString(se.displayName());
@@ -578,7 +577,7 @@ void UsedStreamsModel::onDataChangedMvs(const VideoTeam &data, const DataModific
{
beginResetModel();
INFO_LOG(m_logger) << "onDataChanged m_rootItem->childCount()" << m_rootItem->childCount();
INFO_LOG() << "onDataChanged m_rootItem->childCount()" << m_rootItem->childCount();
switch (modType)
{
@@ -587,7 +586,7 @@ void UsedStreamsModel::onDataChangedMvs(const VideoTeam &data, const DataModific
case DataModification::eModified:
case DataModification::eAdded:
INFO_LOG(m_logger) << "se.id()" << data.id()
INFO_LOG() << "se.id()" << data.id()
<< " se.displayName()" << data.streamName()
<< " m_rootItem->childCount()" << m_rootItem->childCount();
const QString newName = QString::fromStdString(data.streamName());
@@ -603,8 +602,8 @@ void UsedStreamsModel::onStreamNameDataChanged(int32_t mountingPointId, const QS
Q_UNUSED(internalName)
beginResetModel();
INFO_LOG(m_logger) << "onDataChanged m_rootItem->childCount()" << m_rootItem->childCount();
INFO_LOG(m_logger) << "se.id()" << mountingPointId
INFO_LOG() << "onDataChanged m_rootItem->childCount()" << m_rootItem->childCount();
INFO_LOG() << "se.id()" << mountingPointId
<< " se.displayName()" << displayName
<< " m_rootItem->childCount()" << m_rootItem->childCount();
updateStreamNames(mountingPointId, displayName, m_rootItem);
@@ -615,7 +614,7 @@ void UsedStreamsModel::onStreamNameDataChanged(int32_t mountingPointId, const QS
void UsedStreamsModel::updateStreamNames(const int mountingPointId, const QString &newName, NGLTreeItem *item)
{
INFO_LOG(m_logger) << "updateStreamNames mountingPointId=" << mountingPointId
INFO_LOG() << "updateStreamNames mountingPointId=" << mountingPointId
<< " newName=" << newName;
int childCount = item->childCount();
@@ -624,17 +623,17 @@ void UsedStreamsModel::updateStreamNames(const int mountingPointId, const QStrin
NGLTreeItem *child = item->child(i);
if (!child->data().canConvert<StreamModelData>())
ERROR_LOG(m_logger) << "Error convert item";
ERROR_LOG() << "Error convert item";
StreamModelData usedStream = child->data().value<StreamModelData>();
INFO_LOG(m_logger) << "i=" << i
INFO_LOG() << "i=" << i
<< " usedStream.mountingPointId=" << usedStream.mountingPointId
<< " usedStream.name=" << usedStream.name
<< " mountingPointId=" << mountingPointId
<< " newName=" << newName;
if (mountingPointId == usedStream.mountingPointId)
{
INFO_LOG(m_logger) << "Set new DisplayName id=" << usedStream.id
INFO_LOG() << "Set new DisplayName id=" << usedStream.id
<< " mountingPointId=" << usedStream.mountingPointId
<< " name=" << usedStream.name
<< " new Name =" << newName;
@@ -70,7 +70,6 @@ private:
int m_dummyId;
MenuStruct m_menuStruct;
StreamNameMapping *m_streamNameMapping;
NGL::INGLLogger &m_logger;
};
}
@@ -50,15 +50,14 @@ private:
TopicReplay::TopicReplay(DataInterface *dataIfc, bool isAudio)
: m_isAudio(isAudio)
, m_dataIfc(dataIfc)
, m_logger(getLogger("TopicReplay"))
{
DEBUG_LOG(m_logger) << "TopicReplay::TopicReplay()";
DEBUG_LOG() << "TopicReplay::TopicReplay()";
Q_ASSERT(dataIfc);
}
TopicReplay::~TopicReplay()
{
DEBUG_LOG(m_logger) << "TopicReplay::~TopicReplay()";
DEBUG_LOG() << "TopicReplay::~TopicReplay()";
if (m_isPlaying)
playbackStop();
@@ -66,7 +65,7 @@ TopicReplay::~TopicReplay()
QWidget *TopicReplay::createWidget()
{
DEBUG_LOG(m_logger) << "TopicReplay::createWidget()";
DEBUG_LOG() << "TopicReplay::createWidget()";
Q_ASSERT(!m_screenPlacementHelper);
if (m_isAudio)
@@ -81,19 +80,19 @@ QWidget *TopicReplay::createWidget()
void TopicReplay::slotSetScriptResponse(const AudioVideoManagement::AvaStreamInfo &streamInfo, AudioVideoManagement::AvaStreamState streamState)
{
if (streamState == AudioVideoManagement::AvaStreamState::NotPossible)
ERROR_LOG(m_logger) << "Script could not be set";
ERROR_LOG() << "Script could not be set";
else
ERROR_LOG(m_logger) << "Script set!";
ERROR_LOG() << "Script set!";
ERROR_LOG(m_logger) << "streamInfo: start" << streamInfo.duration.count();
ERROR_LOG(m_logger) << "streamState: " << static_cast<int>(streamState);
ERROR_LOG() << "streamInfo: start" << streamInfo.duration.count();
ERROR_LOG() << "streamState: " << static_cast<int>(streamState);
}
bool TopicReplay::playbackInit(const QJsonObject &attributes)
{
DEBUG_LOG(m_logger) << "TopicReplay::playbackInit()";
DEBUG_LOG(m_logger) << QJsonDocument(attributes).toJson();
DEBUG_LOG() << "TopicReplay::playbackInit()";
DEBUG_LOG() << QJsonDocument(attributes).toJson();
if (m_screenPlacementHelper && !m_isAudio)
m_screenPlacementHelper->show();
@@ -104,7 +103,7 @@ bool TopicReplay::playbackInit(const QJsonObject &attributes)
AvaControl *ctrl = getAvaControl();
if (ctrl == nullptr)
{
ERROR_LOG(m_logger) << "no ava control!";
ERROR_LOG() << "no ava control!";
return false;
}
@@ -112,7 +111,7 @@ bool TopicReplay::playbackInit(const QJsonObject &attributes)
if (!topicData.isValid)
{
ERROR_LOG(m_logger) << "topicData is invalid";
ERROR_LOG() << "topicData is invalid";
return false;
}
@@ -123,7 +122,7 @@ bool TopicReplay::playbackInit(const QJsonObject &attributes)
PlaybackApp *app = m_isAudio ? m_dataIfc->audioPresentationApp() : m_dataIfc->videoPresentationApp();
if (app == nullptr || app->inUse())
{
ERROR_LOG(m_logger) << "app invalid or in use!";
ERROR_LOG() << "app invalid or in use!";
return false;
}
@@ -143,7 +142,7 @@ bool TopicReplay::playbackInit(const QJsonObject &attributes)
if (!m_appHandle)
{
ERROR_LOG(m_logger) << "appHandle: missing app after creating appHandle!";
ERROR_LOG() << "appHandle: missing app after creating appHandle!";
return false;
}
@@ -151,7 +150,7 @@ bool TopicReplay::playbackInit(const QJsonObject &attributes)
NGL::Settings s({});
bool isLocal = s.isDatabaseConnectionLocal();
DEBUG_LOG(m_logger) << "isLocal? " << isLocal;
DEBUG_LOG() << "isLocal? " << isLocal;
AvaScriptSource source;
if (isLocal)
@@ -169,7 +168,7 @@ bool TopicReplay::playbackInit(const QJsonObject &attributes)
source = AvaScriptSource::ServerVideo;
}
DEBUG_LOG(m_logger) << "source: " << static_cast<int>(source);
DEBUG_LOG() << "source: " << static_cast<int>(source);
ctrl->setScript(m_appHandle.dialogId(), m_scriptName,
source, topicData.streamList(),
@@ -181,7 +180,7 @@ bool TopicReplay::playbackInit(const QJsonObject &attributes)
bool TopicReplay::playbackStart(int secondsOffset)
{
DEBUG_LOG(m_logger) << "TopicReplay::playbackStart()";
DEBUG_LOG() << "TopicReplay::playbackStart()";
if (m_screenPlacementHelper && !m_isAudio)
m_screenPlacementHelper->show();
@@ -189,7 +188,7 @@ bool TopicReplay::playbackStart(int secondsOffset)
AvaControl *ctrl = getAvaControl();
if (ctrl == nullptr)
{
ERROR_LOG(m_logger) << "ctrl == nullptr";
ERROR_LOG() << "ctrl == nullptr";
return false;
}
@@ -197,7 +196,7 @@ bool TopicReplay::playbackStart(int secondsOffset)
if (!m_appHandle)
{
ERROR_LOG(m_logger) << "appHandle: missing app!";
ERROR_LOG() << "appHandle: missing app!";
return false;
}
@@ -205,13 +204,13 @@ bool TopicReplay::playbackStart(int secondsOffset)
ctrl->startScript(m_appHandle.dialogId(), m_scriptName);
m_isPlaying = true;
DEBUG_LOG(m_logger) << "m_isPlaying = true";
DEBUG_LOG() << "m_isPlaying = true";
return true;
}
bool TopicReplay::playbackPause()
{
DEBUG_LOG(m_logger) << "TopicReplay::playbackPause()";
DEBUG_LOG() << "TopicReplay::playbackPause()";
if (m_screenPlacementHelper)
m_screenPlacementHelper->hide();
@@ -222,13 +221,13 @@ bool TopicReplay::playbackPause()
AvaControl *ctrl = getAvaControl();
if (ctrl == nullptr)
{
ERROR_LOG(m_logger) << "no ctrl!";
ERROR_LOG() << "no ctrl!";
return false;
}
if (!m_appHandle)
{
ERROR_LOG(m_logger) << "appHandle: missing app!";
ERROR_LOG() << "appHandle: missing app!";
return false;
}
@@ -238,7 +237,7 @@ bool TopicReplay::playbackPause()
bool TopicReplay::playbackStop()
{
DEBUG_LOG(m_logger) << "TopicReplay::playbackStop()";
DEBUG_LOG() << "TopicReplay::playbackStop()";
if (m_screenPlacementHelper)
m_screenPlacementHelper->hide();
@@ -249,13 +248,13 @@ bool TopicReplay::playbackStop()
AvaControl *ctrl = getAvaControl();
if (ctrl == nullptr)
{
ERROR_LOG(m_logger) << "no ctrl!";
ERROR_LOG() << "no ctrl!";
return false;
}
if (!m_appHandle)
{
ERROR_LOG(m_logger) << "appHandle: missing app!";
ERROR_LOG() << "appHandle: missing app!";
return false;
}
@@ -275,7 +274,7 @@ bool TopicReplay::exportTopic(const QJsonObject &attributes,
VdControl *ctrl = getVdControl();
if (ctrl == nullptr)
{
ERROR_LOG(m_logger) << "ctrl missing!";
ERROR_LOG() << "ctrl missing!";
exportNotifier->setExportFailed();
return false;
}
@@ -287,7 +286,7 @@ bool TopicReplay::exportTopic(const QJsonObject &attributes,
if (!topicData.isValid)
{
ERROR_LOG(m_logger) << "topicData is invalid";
ERROR_LOG() << "topicData is invalid";
exportNotifier->setExportFailed();
return false;
}
@@ -305,7 +304,7 @@ bool TopicReplay::exportTopic(const QJsonObject &attributes,
void TopicReplay::onWidgetPlaced(const QRect &geometry)
{
WARNING_LOG(m_logger) << "TopicReplay::onWidgetPlaced() - geo: " << geometry.x() << "/" << geometry.y()
WARNING_LOG() << "TopicReplay::onWidgetPlaced() - geo: " << geometry.x() << "/" << geometry.y()
<< " m_isAudio=" << m_isAudio;
m_dialogGeometry = geometry;
@@ -316,17 +315,17 @@ void TopicReplay::onWidgetPlaced(const QRect &geometry)
PlaybackApp *app = m_isAudio ? m_dataIfc->audioPresentationApp() : m_dataIfc->videoPresentationApp();
if (app == nullptr)
{
ERROR_LOG(m_logger) << "app missing!";
ERROR_LOG() << "app missing!";
return;
}
if (!app->inUse())
{
ERROR_LOG(m_logger) << "app not in use - waiting for playbackInit to aquire it";
ERROR_LOG() << "app not in use - waiting for playbackInit to aquire it";
return;
}
DEBUG_LOG(m_logger) << "setGeometry";
DEBUG_LOG() << "setGeometry";
app->setGeometry(*m_dialogGeometry);
}