flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-30 11:55:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T731, display TX/REC from AFV client in UI

Browse Source
This commit is contained in:
Klaus Basan
2019-09-26 22:32:17 +02:00
committed by Mat Sutcliffe
parent 088ef74392
commit 80a96d37fc
2 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/blackgui/components/audiodevicevolumesetupcomponent.cpp
View File

@@ -8,6 +8,7 @@
#include "blackgui/components/audiodevicevolumesetupcomponent.h"
#include "blackgui/guiapplication.h"
#include "blackgui/guiutility.h"
#include "blackcore/afv/clients/afvclient.h"
#include "blackcore/context/contextaudioimpl.h"
@@ -73,6 +74,9 @@ namespace BlackGui
ui->pb_LevelIn->setValue(ui->pb_LevelIn->minimum());
ui->pb_LevelOut->setValue(ui->pb_LevelOut->minimum());
// all tx/rec checkboxes
CGuiUtility::checkBoxesReadOnly(ui->fr_TxRec, true);
}
void CAudioDeviceVolumeSetupComponent::init()
@@ -115,9 +119,9 @@ namespace BlackGui
{
connect(afvClient, &CAfvClient::outputVolumePeakVU, this, &CAudioDeviceVolumeSetupComponent::onOutputVU);
connect(afvClient, &CAfvClient::inputVolumePeakVU, this, &CAudioDeviceVolumeSetupComponent::onInputVU);
connect(afvClient, &CAfvClient::receivingCallsignsChanged, this, &CAudioDeviceVolumeSetupComponent::onReceivingCallsignsChanged);
connect(afvClient, &CAfvClient::receivingCallsignsChanged, this, &CAudioDeviceVolumeSetupComponent::onReceivingCallsignsChanged, Qt::QueuedConnection);
connect(afvClient, &CAfvClient::updatedFromOwnAircraftCockpit, this, &CAudioDeviceVolumeSetupComponent::onUpdatedClientWithCockpitData, Qt::QueuedConnection);
}
}
Q_UNUSED(c)
}
@@ -180,7 +184,7 @@ namespace BlackGui
ui->le_Info->setText(info);
}
void CAudioDeviceVolumeSetupComponent::setTransmitReceive(bool tx1, bool rec1, bool tx2, bool rec2)
void CAudioDeviceVolumeSetupComponent::setTransmitReceiveInUi(bool tx1, bool rec1, bool tx2, bool rec2)
{
ui->cb_1Tx->setChecked(tx1);
ui->cb_2Tx->setChecked(tx2);
@@ -188,6 +192,23 @@ namespace BlackGui
ui->cb_2Rec->setChecked(rec2);
}
void CAudioDeviceVolumeSetupComponent::setTransmitReceiveInUiFromVoiceClient()
{
const CAfvClient *client = this->afvClient();
if (!client) { return; }
const bool com1Enabled = client->isEnabledComUnit(CComSystem::Com1);
const bool com2Enabled = client->isEnabledComUnit(CComSystem::Com2);
const bool com1Tx = com1Enabled && client->isTransmittingdComUnit(CComSystem::Com1);
const bool com2Tx = com2Enabled && client->isTransmittingdComUnit(CComSystem::Com2);
// we do not have receiving
const bool com1Rec = com1Enabled;
const bool com2Rec = com2Enabled;
this->setTransmitReceiveInUi(com1Tx, com1Rec, com2Tx, com2Rec);
}
void CAudioDeviceVolumeSetupComponent::reloadSettings()
{
const CSettings as(m_audioSettings.getThreadLocal());
@@ -260,6 +281,11 @@ namespace BlackGui
this->setInfo(args.receivingCallsigns.join(", "));
}
void CAudioDeviceVolumeSetupComponent::onUpdatedClientWithCockpitData()
{
this->setTransmitReceiveInUiFromVoiceClient();
}
CAudioDeviceInfo CAudioDeviceVolumeSetupComponent::getSelectedInputDevice() const
{
if (!hasAudio()) { return CAudioDeviceInfo(); }

10
src/blackgui/components/audiodevicevolumesetupcomponent.h
View File

@@ -59,9 +59,6 @@ namespace BlackGui
//! Info string
void setInfo(const QString &info);
//! Transmit and receive state
void setTransmitReceive(bool tx1, bool rec1, bool tx2, bool rec2);
private:
//! Init
void init();
@@ -104,10 +101,17 @@ namespace BlackGui
void onResetVolumeIn();
void onResetVolumeOut();
void onReceivingCallsignsChanged(const BlackCore::Afv::Audio::TransceiverReceivingCallsignsChangedArgs &args);
void onUpdatedClientWithCockpitData();
BlackMisc::Audio::CAudioDeviceInfo getSelectedInputDevice() const;
BlackMisc::Audio::CAudioDeviceInfo getSelectedOutputDevice() const;
//! Transmit and receive state @{
void setTransmitReceiveInUi(bool tx1, bool rec1, bool tx2, bool rec2);
void setTransmitReceiveInUiFromVoiceClient();
//! @}
static BlackCore::Afv::Clients::CAfvClient *afvClient();
QScopedPointer<Ui::CAudioDeviceVolumeSetupComponent> ui;