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 T398, style

Browse Source
This commit is contained in:
Klaus Basan
2018-10-10 18:37:07 +02:00
parent dec0b12ea2
commit d7de7785af
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/blackgui/components/audiosetupcomponent.cpp
View File

@@ -45,13 +45,14 @@ namespace BlackGui
// audio is optional // audio is optional
const bool audio = this->hasAudio(); const bool audio = this->hasAudio();
this->setEnabled(audio); this->setEnabled(audio);
ui->le_ExtraInfo->setText(audio ? sGui->getIContextAudio()->audioRunsWhereInfo() : "No audio, cannot change.");
bool c = connect(ui->cb_SetupAudioLoopback, &QCheckBox::toggled, this, &CAudioSetupComponent::onLoopbackToggled); bool c = connect(ui->cb_SetupAudioLoopback, &QCheckBox::toggled, this, &CAudioSetupComponent::onLoopbackToggled);
Q_ASSERT(c); Q_ASSERT(c);
if (audio) if (audio)
{ {
ui->le_ExtraInfo->setText(audio ? sGui->getIContextAudio()->audioRunsWhereInfo() : "No audio, cannot change.");
this->initAudioDeviceLists(); this->initAudioDeviceLists();
// default // default
@@ -146,7 +147,7 @@ namespace BlackGui
ui->cb_SetupAudioOutputDevice->clear(); ui->cb_SetupAudioOutputDevice->clear();
ui->cb_SetupAudioInputDevice->clear(); ui->cb_SetupAudioInputDevice->clear();
for (auto &device : devices) for (const CAudioDeviceInfo &device : devices)
{ {
if (device.getType() == CAudioDeviceInfo::InputDevice) if (device.getType() == CAudioDeviceInfo::InputDevice)
{ {

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

@@ -9,6 +9,7 @@
#include "blackmisc/audio/audiodeviceinfo.h" #include "blackmisc/audio/audiodeviceinfo.h"
#include <QStringBuilder>
#include <QHostInfo> #include <QHostInfo>
#include <QtGlobal> #include <QtGlobal>
@@ -18,7 +19,7 @@ namespace BlackMisc
{ {
CAudioDeviceInfo::CAudioDeviceInfo() : CAudioDeviceInfo::CAudioDeviceInfo() :
m_type(Unknown), m_deviceIndex(invalidDeviceIndex()), m_type(Unknown), m_deviceIndex(invalidDeviceIndex()),
m_deviceName(""), m_hostName(QHostInfo::localHostName()) m_hostName(QHostInfo::localHostName())
{ } { }
CAudioDeviceInfo::CAudioDeviceInfo(DeviceType type, const int index, const QString &name) : CAudioDeviceInfo::CAudioDeviceInfo(DeviceType type, const int index, const QString &name) :
@@ -29,13 +30,8 @@ namespace BlackMisc
QString CAudioDeviceInfo::convertToQString(bool i18n) const QString CAudioDeviceInfo::convertToQString(bool i18n) const
{ {
Q_UNUSED(i18n); Q_UNUSED(i18n);
if (this->m_hostName.isEmpty()) return m_deviceName; if (m_hostName.isEmpty()) { return m_deviceName; }
QString s(this->m_deviceName); return m_deviceName % QStringLiteral(" [") % this->getHostName() % QStringLiteral("]");
s.append(" [");
s.append(this->getHostName());
s.append("]");
return s;
} }
} // Voice } // Voice
} // BlackMisc } // BlackMisc