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

refactor: Remove secondary way to start/stop AFV client

Browse Source 
To reduce complexity, there should only be a single way to start the AFV
client (done on connectionStatusChange of IContextNetwork)
This commit is contained in:
Lars Toenning
2024-03-25 16:40:53 +01:00
parent 61ee861d8e
commit b6867445fa
6 changed files with 1 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
src/blackgui/components/audioadvanceddistributedcomponent.cpp
View File

@@ -19,57 +19,12 @@ namespace BlackGui::Components
{
ui->setupUi(this);
connect(sGui->getCContextAudioBase(), &CContextAudioBase::startedAudio, this, &CAudioAdvancedDistributedComponent::onAudioStarted, Qt::QueuedConnection);
connect(sGui->getCContextAudioBase(), &CContextAudioBase::stoppedAudio, this, &CAudioAdvancedDistributedComponent::onAudioStoppend, Qt::QueuedConnection);
connect(ui->pb_EnableDisable, &QPushButton::pressed, this, &CAudioAdvancedDistributedComponent::toggleAudioEnableDisable, Qt::QueuedConnection);
connect(ui->pb_StartStop, &QPushButton::pressed, this, &CAudioAdvancedDistributedComponent::toggleAudioStartStop, Qt::QueuedConnection);
connect(ui->pb_ReloadRegistered, &QPushButton::pressed, this, &CAudioAdvancedDistributedComponent::reloadRegisteredDevices, Qt::QueuedConnection);
this->setButtons();
}
CAudioAdvancedDistributedComponent::~CAudioAdvancedDistributedComponent()
{}
void CAudioAdvancedDistributedComponent::toggleAudioStartStop()
{
if (!hasContexts()) { return; }
const bool started = sGui->getCContextAudioBase()->isAudioStarted();
if (started)
{
sGui->getCContextAudioBase()->afvClient()->disconnectFromAndStop();
}
else
{
sGui->getCContextAudioBase()->afvClient()->startAudio();
if (sGui->getIContextNetwork()->isConnected())
{
const bool connected = sGui->getCContextAudioBase()->connectAudioWithNetworkCredentials();
Q_UNUSED(connected)
// one reason for not connecting is NOT using the VATSIM ecosystem
}
}
this->setButtons(2000);
}
void CAudioAdvancedDistributedComponent::toggleAudioEnableDisable()
{
if (!hasContexts()) { return; }
const bool enabled = sGui->getCContextAudioBase()->isAudioEnabled();
if (enabled)
{
sGui->getCContextAudioBase()->disableVoiceClient();
}
else
{
sGui->getCContextAudioBase()->enableVoiceClientAndStart();
}
this->setButtons(2000);
}
void CAudioAdvancedDistributedComponent::reloadRegisteredDevices()
{
if (!hasContexts()) { return; }
@@ -77,40 +32,6 @@ namespace BlackGui::Components
ui->tvp_RegisteredDevices->updateContainerMaybeAsync(registeredDevices);
}
void CAudioAdvancedDistributedComponent::setButtons()
{
if (!hasContexts()) { return; }
const bool started = sGui->getCContextAudioBase()->isAudioStarted();
const bool enabled = sGui->getCContextAudioBase()->isAudioEnabled();
ui->pb_StartStop->setText(started ? "stop" : "start");
ui->pb_StartStop->setEnabled(enabled);
ui->pb_EnableDisable->setText(enabled ? "disable" : "enable");
}
void CAudioAdvancedDistributedComponent::setButtons(int delayMs)
{
if (!hasContexts()) { return; }
QPointer<CAudioAdvancedDistributedComponent> myself(this);
QTimer::singleShot(delayMs, this, [=] {
if (!sGui || !myself || sGui->isShuttingDown()) { return; }
this->setButtons();
});
}
void CAudioAdvancedDistributedComponent::onAudioStarted(const CAudioDeviceInfo &inputDevice, const CAudioDeviceInfo &outputDevice)
{
Q_UNUSED(inputDevice)
Q_UNUSED(outputDevice)
this->setButtons();
this->reloadRegisteredDevices();
}
void CAudioAdvancedDistributedComponent::onAudioStoppend()
{
this->setButtons();
this->reloadRegisteredDevices();
}
bool CAudioAdvancedDistributedComponent::hasContexts()
{
if (!sGui || sGui->isShuttingDown() || !sGui->getCContextAudioBase()) { return false; }