Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-24 01:03:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed naming to match standards

Browse source
This commit is contained in:
amerhifi 2019-10-18 15:16:37 -07:00
parent c7e1fdaeac
commit 421cff1cb2
3 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
interface/src/scripting/AudioDevices.cpp
View file

@ -306,15 +306,15 @@ void AudioDeviceList::onDevicesChanged(const QList<HifiAudioDeviceInfo>& devices
} }
switch (deviceInfo.getDeviceType()) { switch (deviceInfo.getDeviceType()) {
case HifiAudioDeviceInfo::hmd: case HifiAudioDeviceInfo::hmd:
device.type = "hmd"; device.type = "hmd";
break; break;
case HifiAudioDeviceInfo::desktop: case HifiAudioDeviceInfo::desktop:
device.type = "desktop"; device.type = "desktop";
break; break;
case HifiAudioDeviceInfo::both: case HifiAudioDeviceInfo::both:
device.type = "both"; device.type = "both";
break; break;
} }

1
libraries/audio-client/src/HifiAudioDeviceInfo.cpp
View file

@ -26,7 +26,6 @@ HifiAudioDeviceInfo& HifiAudioDeviceInfo::operator=(const HifiAudioDeviceInfo& o
return *this; return *this;
} }
bool HifiAudioDeviceInfo::operator==(const HifiAudioDeviceInfo& rhs) const { bool HifiAudioDeviceInfo::operator==(const HifiAudioDeviceInfo& rhs) const {
//Does the QAudioDeviceinfo match as well as is this the default device or //Does the QAudioDeviceinfo match as well as is this the default device or
return getDevice() == rhs.getDevice() && isDefault() == rhs.isDefault(); return getDevice() == rhs.getDevice() && isDefault() == rhs.isDefault();

8
libraries/audio-client/src/HifiAudioDeviceInfo.h
View file

@ -23,7 +23,7 @@ class HifiAudioDeviceInfo : public QObject {
Q_OBJECT Q_OBJECT
public: public:
enum deviceType { enum DeviceType {
desktop, desktop,
hmd, hmd,
both both
@ -38,7 +38,7 @@ public:
} }
HifiAudioDeviceInfo(QAudioDeviceInfo deviceInfo, bool isDefault, QAudio::Mode mode, deviceType devType=both) : HifiAudioDeviceInfo(QAudioDeviceInfo deviceInfo, bool isDefault, QAudio::Mode mode, DeviceType devType=both) :
_audioDeviceInfo(deviceInfo), _audioDeviceInfo(deviceInfo),
_isDefault(isDefault), _isDefault(isDefault),
_mode(mode), _mode(mode),
@ -61,7 +61,7 @@ public:
QAudioDeviceInfo getDevice() const { return _audioDeviceInfo; } QAudioDeviceInfo getDevice() const { return _audioDeviceInfo; }
bool isDefault() const { return _isDefault; } bool isDefault() const { return _isDefault; }
QAudio::Mode getMode() const { return _mode; } QAudio::Mode getMode() const { return _mode; }
deviceType getDeviceType() const { return _deviceType; } DeviceType getDeviceType() const { return _deviceType; }
HifiAudioDeviceInfo& operator=(const HifiAudioDeviceInfo& other); HifiAudioDeviceInfo& operator=(const HifiAudioDeviceInfo& other);
bool operator==(const HifiAudioDeviceInfo& rhs) const; bool operator==(const HifiAudioDeviceInfo& rhs) const;
bool operator!=(const HifiAudioDeviceInfo& rhs) const; bool operator!=(const HifiAudioDeviceInfo& rhs) const;
@ -71,7 +71,7 @@ private:
QAudioDeviceInfo _audioDeviceInfo; QAudioDeviceInfo _audioDeviceInfo;
bool _isDefault { false }; bool _isDefault { false };
QAudio::Mode _mode { QAudio::AudioInput }; QAudio::Mode _mode { QAudio::AudioInput };
deviceType _deviceType{ both }; DeviceType _deviceType{ both };
public: public:
static const QString DEFAULT_DEVICE_NAME; static const QString DEFAULT_DEVICE_NAME;