VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-08-14 23:43:43 -04:00
Code Issues Projects Releases Wiki Activity

Update plugins to compile with Qt5 and Qt6

Browse Source
This commit is contained in:
Jon Beniston
2022-11-17 14:36:12 +00:00
parent fc7c9c1fc8
commit 3b5b222114
122 changed files with 174 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplesource/audioinput/audioinputsettings.h
+2 -6
View File
@@ -20,7 +20,7 @@
#define _AUDIOINPUT_AUDIOINPUTSETTINGS_H_
#include <QString>
#include <QAudioDeviceInfo>
#include "audio/audiodeviceinfo.h"
struct AudioInputSettings {
@@ -46,17 +46,13 @@ struct AudioInputSettings {
bool deserialize(const QByteArray& data);
// Append realm to device names, because there may be multiple devices with the same name on Windows
static QString getFullDeviceName(const QAudioDeviceInfo &deviceInfo)
static QString getFullDeviceName(const AudioDeviceInfo &deviceInfo)
{
#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
return deviceInfo.deviceName();
#else
QString realm = deviceInfo.realm();
if (realm != "" && realm != "default" && realm != "alsa")
return deviceInfo.deviceName() + " " + realm;
else
return deviceInfo.deviceName();
#endif
}
void applySettings(const QStringList& settingsKeys, const AudioInputSettings& settings);
QString getDebugString(const QStringList& settingsKeys, bool force=false) const;