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

Ref T731, initally also update UI with "onUpdatedClientWithCockpitData()"

Browse Source
This commit is contained in:
Klaus Basan
2019-10-08 21:59:09 +02:00
committed by Mat Sutcliffe
parent ff33b59683
commit 160589c975
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -122,6 +122,8 @@ namespace BlackGui
connect(afvClient, &CAfvClient::inputVolumePeakVU, this, &CAudioDeviceVolumeSetupComponent::onInputVU); connect(afvClient, &CAfvClient::inputVolumePeakVU, this, &CAudioDeviceVolumeSetupComponent::onInputVU);
connect(afvClient, &CAfvClient::receivingCallsignsChanged, this, &CAudioDeviceVolumeSetupComponent::onReceivingCallsignsChanged, Qt::QueuedConnection); connect(afvClient, &CAfvClient::receivingCallsignsChanged, this, &CAudioDeviceVolumeSetupComponent::onReceivingCallsignsChanged, Qt::QueuedConnection);
connect(afvClient, &CAfvClient::updatedFromOwnAircraftCockpit, this, &CAudioDeviceVolumeSetupComponent::onUpdatedClientWithCockpitData, Qt::QueuedConnection); connect(afvClient, &CAfvClient::updatedFromOwnAircraftCockpit, this, &CAudioDeviceVolumeSetupComponent::onUpdatedClientWithCockpitData, Qt::QueuedConnection);
this->onUpdatedClientWithCockpitData();
} }
} }
Q_UNUSED(c) Q_UNUSED(c)
@@ -147,7 +149,7 @@ namespace BlackGui
void CAudioDeviceVolumeSetupComponent::setInValue(int value, int from, int to) void CAudioDeviceVolumeSetupComponent::setInValue(int value, int from, int to)
{ {
if (value > to) { value = to; } if (value > to) { value = to; }
if (value < from) { value = from; } else if (value < from) { value = from; }
const double r = ui->hs_VolumeIn->maximum() - ui->hs_VolumeIn->minimum(); const double r = ui->hs_VolumeIn->maximum() - ui->hs_VolumeIn->minimum();
const double tr = to - from; const double tr = to - from;
ui->hs_VolumeIn->setValue(qRound(value / tr * r)); ui->hs_VolumeIn->setValue(qRound(value / tr * r));
@@ -156,7 +158,7 @@ namespace BlackGui
void CAudioDeviceVolumeSetupComponent::setOutValue(int value, int from, int to) void CAudioDeviceVolumeSetupComponent::setOutValue(int value, int from, int to)
{ {
if (value > to) { value = to; } if (value > to) { value = to; }
if (value < from) { value = from; } else if (value < from) { value = from; }
const double r = ui->hs_VolumeOut->maximum() - ui->hs_VolumeOut->minimum(); const double r = ui->hs_VolumeOut->maximum() - ui->hs_VolumeOut->minimum();
const double tr = to - from; const double tr = to - from;
ui->hs_VolumeOut->setValue(qRound(value / tr * r)); ui->hs_VolumeOut->setValue(qRound(value / tr * r));
@@ -165,14 +167,14 @@ namespace BlackGui
void CAudioDeviceVolumeSetupComponent::setInLevel(double value) void CAudioDeviceVolumeSetupComponent::setInLevel(double value)
{ {
if (value > 1.0) { value = 1.0; } if (value > 1.0) { value = 1.0; }
if (value < 0.0) { value = 0.0; } else if (value < 0.0) { value = 0.0; }
ui->wip_InLevelMeter->levelChanged(value); ui->wip_InLevelMeter->levelChanged(value);
} }
void CAudioDeviceVolumeSetupComponent::setOutLevel(double value) void CAudioDeviceVolumeSetupComponent::setOutLevel(double value)
{ {
if (value > 1.0) { value = 1.0; } if (value > 1.0) { value = 1.0; }
if (value < 0.0) { value = 0.0; } else if (value < 0.0) { value = 0.0; }
ui->wip_OutLevelMeter->levelChanged(value); ui->wip_OutLevelMeter->levelChanged(value);
} }
@@ -211,7 +213,7 @@ namespace BlackGui
const CSettings as(m_audioSettings.getThreadLocal()); const CSettings as(m_audioSettings.getThreadLocal());
ui->cb_DisableAudioEffects->setChecked(!as.isAudioEffectsEnabled()); ui->cb_DisableAudioEffects->setChecked(!as.isAudioEffectsEnabled());
this->setInValue(as.getInVolume()); this->setInValue(as.getInVolume());
this->setOutValue(as.getInVolume()); this->setOutValue(as.getOutVolume());
} }
void CAudioDeviceVolumeSetupComponent::initAudioDeviceLists() void CAudioDeviceVolumeSetupComponent::initAudioDeviceLists()
@@ -300,9 +302,7 @@ namespace BlackGui
{ {
if (!sGui || sGui->isShuttingDown() || !sGui->getIContextAudio()) { return nullptr; } if (!sGui || sGui->isShuttingDown() || !sGui->getIContextAudio()) { return nullptr; }
if (!sGui->getIContextAudio()->isUsingImplementingObject()) { return nullptr; } if (!sGui->getIContextAudio()->isUsingImplementingObject()) { return nullptr; }
return sGui->getCoreFacade()->getCContextAudio()->voiceClient();
CAfvClient &afvClient = sGui->getCoreFacade()->getCContextAudio()->voiceClient();
return &afvClient;
} }
void CAudioDeviceVolumeSetupComponent::onAudioDeviceSelected(int index) void CAudioDeviceVolumeSetupComponent::onAudioDeviceSelected(int index)