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

[AFV] Ref T730, check for same device

Browse Source
This commit is contained in:
Klaus Basan
2019-10-13 00:14:52 +02:00
parent 10a64c0330
commit 541ce76fb6
5 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,6 +59,8 @@ namespace BlackCore
connect(m_connection, &CClientConnection::audioReceived, this, &CAfvClient::audioOutDataAvailable);
connect(m_voiceServerPositionTimer, &QTimer::timeout, this, &CAfvClient::onPositionUpdateTimer);
m_updateTimer.stop(); // not used
// deferred init - use BlackMisc:: singleShot to call in correct thread, "myself" NOT needed
BlackMisc::singleShot(1000, this, [ = ]
{
@@ -264,7 +266,6 @@ namespace BlackCore
m_connection->setReceiveAudio(false);
// stop input/output
m_updateTimer.stop();
m_input->stop();
m_output->stop();
CLogMessage(this).info(u"Client stopped");
@@ -910,6 +911,18 @@ namespace BlackCore
return nullDevice;
}
bool CAfvClient::usesSameDevices(const CAudioDeviceInfo &inputDevice, const CAudioDeviceInfo &outputDevice)
{
QMutexLocker lock(&m_mutex);
if (!m_output || !m_input) { return false; }
const CAudioDeviceInfo i = m_input->device();
const CAudioDeviceInfo o = m_output->device();
lock.unlock();
return i.matchesNameTypeHostName(inputDevice) &&
o.matchesNameTypeHostName(outputDevice);
}
CAfvClient::ConnectionStatus CAfvClient::getConnectionStatus() const
{
return m_connection->isConnected() ? Connected : Disconnected;

1
src/blackcore/afv/clients/afvclient.h
View File

@@ -209,6 +209,7 @@ namespace BlackCore
//! @{
const BlackMisc::Audio::CAudioDeviceInfo &getInputDevice() const;
const BlackMisc::Audio::CAudioDeviceInfo &getOutputDevice() const;
bool usesSameDevices(const BlackMisc::Audio::CAudioDeviceInfo &inputDevice, const BlackMisc::Audio::CAudioDeviceInfo &outputDevice);
//! @}
//! Callsigns currently received

8
src/blackmisc/audio/audiodeviceinfo.cpp
View File

@@ -7,6 +7,7 @@
*/
#include "blackmisc/audio/audiodeviceinfo.h"
#include "blackmisc/stringutils.h"
#include <QStringBuilder>
#include <QHostInfo>
@@ -26,6 +27,13 @@ namespace BlackMisc
m_deviceName(name), m_hostName(QHostInfo::localHostName())
{ }
bool CAudioDeviceInfo::matchesNameTypeHostName(const CAudioDeviceInfo &device) const
{
return device.getType() == this->getType() &&
stringCompare(device.getName(), this->getName(), Qt::CaseInsensitive) &&
stringCompare(device.getHostName(), this->getHostName(), Qt::CaseInsensitive);
}
CAudioDeviceInfo::DeviceType CAudioDeviceInfo::fromQtMode(QAudio::Mode m)
{
switch (m)

3
src/blackmisc/audio/audiodeviceinfo.h
View File

@@ -67,6 +67,9 @@ namespace BlackMisc
//! Is this a default device?
bool isDefault() const { return m_deviceName == "default"; }
//! Mathcing name, type and machine
bool matchesNameTypeHostName(const CAudioDeviceInfo &device) const;
//! Convert the Qt type
static DeviceType fromQtMode(QAudio::Mode m);

12
src/blackmisc/audio/audiodeviceinfolist.cpp
View File

@@ -76,13 +76,11 @@ namespace BlackMisc
CAudioDeviceInfo CAudioDeviceInfoList::findRegisteredDevice(const CAudioDeviceInfo &device) const
{
CAudioDeviceInfoList devices = device.isInputDevice() ? this->getInputDevices() : this->getOutputDevices();
if (devices.isEmpty()) { return {}; }
devices = devices.findByHostName(device.getHostName());
if (devices.isEmpty()) { return {}; }
return devices.findByName(device.getName());
for (const CAudioDeviceInfo &d : *this)
{
if (device.matchesNameTypeHostName(d)) { return d; }
}
return {};
}
void CAudioDeviceInfoList::registerDevice(const CAudioDeviceInfo &device)