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

Ref T730, style

Browse Source
This commit is contained in:
Klaus Basan
2019-09-29 15:37:59 +02:00
committed by Mat Sutcliffe
parent c1470f6069
commit bde7baf84d
10 changed files with 44 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/blackcore/afv/audio/output.h
View File

@@ -61,15 +61,16 @@ namespace BlackCore
static constexpr int SampleCountPerEvent = 4800;
QAudioFormat m_outputFormat;
double m_maxSampleOutput = 0;
int m_sampleCount = 0;
const double m_maxDb = 0;
const double m_minDb = -40;
int m_sampleCount = 0;
const double m_maxDb = 0;
const double m_minDb = -40;
};
//! Output
class Output : public QObject
{
Q_OBJECT
public:
//! Ctor
Output(QObject *parent = nullptr);

16
src/blackcore/afv/clients/afvclient.cpp
View File

@@ -142,7 +142,7 @@ namespace BlackCore
outputSampleProvider->setVolume(m_outputVolume);
m_output->start(outputDevice.isNull() ? QAudioDeviceInfo::defaultOutputDevice() : outputDevice, outputSampleProvider);
m_input->start(inputDevice.isNull() ? QAudioDeviceInfo::defaultInputDevice() : inputDevice);
m_input->start(inputDevice.isNull() ? QAudioDeviceInfo::defaultInputDevice() : inputDevice);
m_startDateTimeUtc = QDateTime::currentDateTimeUtc();
m_connection->setReceiveAudio(true);
@@ -226,7 +226,7 @@ namespace BlackCore
void CAfvClient::updateComFrequency(CComSystem::ComUnit comUnit, const CFrequency &comFrequency)
{
const int freqHz = static_cast<int>(comFrequency.valueInteger(CFrequencyUnit::Hz()));
const quint16 freqHz = static_cast<quint16>(comFrequency.valueInteger(CFrequencyUnit::Hz()));
this->updateComFrequency(comUnitToTransceiverId(comUnit), freqHz);
}
@@ -494,13 +494,13 @@ namespace BlackCore
this->updateComFrequency(CComSystem::Com1, com1);
this->updateComFrequency(CComSystem::Com2, com2);
const bool tx1 = com1.isTransmitEnabled();
const bool rec1 = com1.isReceiveEnabled();
const bool tx2 = com2.isTransmitEnabled();
const bool rec2 = com2.isReceiveEnabled();
const bool tx1 = com1.isTransmitEnabled();
const bool rx1 = com1.isReceiveEnabled();
const bool tx2 = com2.isTransmitEnabled();
const bool rx2 = com2.isReceiveEnabled();
this->enableComUnit(CComSystem::Com1, tx1 || rec1);
this->enableComUnit(CComSystem::Com2, tx2 || rec2);
this->enableComUnit(CComSystem::Com1, tx1 || rx1);
this->enableComUnit(CComSystem::Com2, tx2 || rx2);
this->setTransmittingComUnit(CComSystem::Com1);
this->setTransmittingComUnit(CComSystem::Com2);

4
src/blackcore/context/contextaudioimpl.cpp
View File

@@ -58,8 +58,8 @@ namespace BlackCore
CIdentifiable(this),
m_voiceClient(("https://voice1.vatsim.uk"))
{
this->setVoiceOutputVolume(m_audioSettings.getThreadLocal().getOutVolume());
const CSettings as = m_audioSettings.getThreadLocal();
this->setVoiceOutputVolume(as.getOutVolume());
m_selcalPlayer = new CSelcalPlayer(QAudioDeviceInfo::defaultOutputDevice(), this);
connect(&m_voiceClient, &CAfvClient::ptt, this, &CContextAudio::ptt);