Style, minor adjustments

This commit is contained in:
Klaus Basan
2019-10-20 23:08:52 +02:00
parent 852f707f7f
commit be99911372
10 changed files with 38 additions and 28 deletions

View File

@@ -747,20 +747,30 @@ namespace BlackCore
emit outputVolumePeakVU(args.PeakVU);
}
QString CAfvClient::getReceivingCallsignsCom1()
QString CAfvClient::getReceivingCallsignsCom1() const
{
QMutexLocker lock(&m_mutex);
if (!m_soundcardSampleProvider) return {};
return m_soundcardSampleProvider->getReceivingCallsigns(0);
}
QString CAfvClient::getReceivingCallsignsCom2()
QString CAfvClient::getReceivingCallsignsCom2() const
{
QMutexLocker lock(&m_mutex);
if (!m_soundcardSampleProvider) return {};
return m_soundcardSampleProvider->getReceivingCallsigns(1);
}
QStringList CAfvClient::getReceivingCallsignsCom1Com2() const
{
QStringList coms;
QMutexLocker lock(&m_mutex);
if (!m_soundcardSampleProvider) { return {{ QString(), QString()}}; }
coms << m_soundcardSampleProvider->getReceivingCallsigns(0);
coms << m_soundcardSampleProvider->getReceivingCallsigns(1);
return coms;
}
bool CAfvClient::updateVoiceServerUrl(const QString &url)
{
QMutexLocker lock(&m_mutexConnection);

View File

@@ -224,7 +224,7 @@ namespace BlackCore
//! Recently used device
//! \threadsafe
//! @{
const BlackMisc::Audio::CAudioDeviceInfo &getInputDevice() const;
const BlackMisc::Audio::CAudioDeviceInfo &getInputDevice() const;
const BlackMisc::Audio::CAudioDeviceInfo &getOutputDevice() const;
bool usesSameDevices(const BlackMisc::Audio::CAudioDeviceInfo &inputDevice, const BlackMisc::Audio::CAudioDeviceInfo &outputDevice);
//! @}
@@ -232,8 +232,9 @@ namespace BlackCore
//! Callsigns currently received
//! \threadsafe
//! @{
QString getReceivingCallsignsCom1();
QString getReceivingCallsignsCom2();
QString getReceivingCallsignsCom1() const;
QString getReceivingCallsignsCom2() const;
QStringList getReceivingCallsignsCom1Com2() const;
//! @}
//! Update the voice server URL