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

Ref T730, allow to specify a default value -> findByNameOrDefault

Browse Source
This commit is contained in:
Klaus Basan
2019-10-10 01:18:17 +02:00
committed by Mat Sutcliffe
parent fc70767636
commit 47475f1a18
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,6 +38,12 @@ namespace BlackMisc
CAudioDeviceInfo CAudioDeviceInfoList::findByName(const QString &name, bool strict) const CAudioDeviceInfo CAudioDeviceInfoList::findByName(const QString &name, bool strict) const
{ {
return this->findByNameOrDefault(name, CAudioDeviceInfo(), strict);
}
CAudioDeviceInfo CAudioDeviceInfoList::findByNameOrDefault(const QString &name, const CAudioDeviceInfo defaultDevice, bool strict) const
{
if (name.isEmpty()) { return defaultDevice; }
for (const CAudioDeviceInfo &d : *this) for (const CAudioDeviceInfo &d : *this)
{ {
if (strict) if (strict)
@@ -50,7 +56,7 @@ namespace BlackMisc
if (name.startsWith(d.getName(), Qt::CaseInsensitive)) { return d; } if (name.startsWith(d.getName(), Qt::CaseInsensitive)) { return d; }
} }
} }
return CAudioDeviceInfo(); return defaultDevice;
} }
int CAudioDeviceInfoList::count(CAudioDeviceInfo::DeviceType type) const int CAudioDeviceInfoList::count(CAudioDeviceInfo::DeviceType type) const

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

@@ -48,6 +48,9 @@ namespace BlackMisc
//! Find by name //! Find by name
CAudioDeviceInfo findByName(const QString &name, bool strict = false) const; CAudioDeviceInfo findByName(const QString &name, bool strict = false) const;
//! Find by name
CAudioDeviceInfo findByNameOrDefault(const QString &name, const CAudioDeviceInfo defaultDevice, bool strict = false) const;
//! Count (as of type) //! Count (as of type)
int count(CAudioDeviceInfo::DeviceType type) const; int count(CAudioDeviceInfo::DeviceType type) const;