Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 08:36:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

addressing cr comments

Browse source
This commit is contained in:
amer cerkic 2019-09-25 13:22:50 -07:00
parent 9daf670678
commit 73f14d812f
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -66,8 +66,8 @@ static QString getTargetDevice(bool hmd, QAudio::Mode mode) {
} else { // if (_mode == QAudio::AudioOutput) } else { // if (_mode == QAudio::AudioOutput)
deviceName = qApp->getActiveDisplayPlugin()->getPreferredAudioOutDevice(); deviceName = qApp->getActiveDisplayPlugin()->getPreferredAudioOutDevice();
} }
} else if (!setting.isSet()) { } else {
deviceName = "default"; deviceName = HifiAudioDeviceInfo::DEFAULT_DEVICE_NAME;
} }
return deviceName; return deviceName;
} }
@ -198,16 +198,10 @@ void AudioDeviceList::resetDevice(bool contextIsHMD) {
void AudioDeviceList::onDeviceChanged(const HifiAudioDeviceInfo& device, bool isHMD) { void AudioDeviceList::onDeviceChanged(const HifiAudioDeviceInfo& device, bool isHMD) {
HifiAudioDeviceInfo& selectedDevice = isHMD ? _selectedHMDDevice : _selectedDesktopDevice; HifiAudioDeviceInfo& selectedDevice = isHMD ? _selectedHMDDevice : _selectedDesktopDevice;
selectedDevice = device; selectedDevice = device;
for (auto i = 0; i < _devices.size(); ++i) { for (auto i = 0; i < _devices.size(); ++i) {
std::shared_ptr<AudioDevice> device = _devices[i]; std::shared_ptr<AudioDevice> device = _devices[i];
bool& isSelected = isHMD ? device->selectedHMD : device->selectedDesktop; bool& isSelected = isHMD ? device->selectedHMD : device->selectedDesktop;
HifiAudioDeviceInfo devInfo = device->info; isSelected = device->info == selectedDevice;
isSelected = false;
if (devInfo == selectedDevice) {
isSelected = true;
}
} }
emit deviceChanged(selectedDevice); emit deviceChanged(selectedDevice);

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

@ -12,6 +12,8 @@
#include "HifiAudioDeviceInfo.h" #include "HifiAudioDeviceInfo.h"
const QString HifiAudioDeviceInfo::DEFAULT_DEVICE_NAME = "default ";
void HifiAudioDeviceInfo::setDevice(QAudioDeviceInfo devInfo) { void HifiAudioDeviceInfo::setDevice(QAudioDeviceInfo devInfo) {
_audioDeviceInfo = devInfo; _audioDeviceInfo = devInfo;
} }
@ -25,9 +27,10 @@ HifiAudioDeviceInfo& HifiAudioDeviceInfo::operator=(const HifiAudioDeviceInfo& o
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
return getDevice() == rhs.getDevice() && isDefault() == rhs.isDefault(); return getDevice() == rhs.getDevice() && isDefault() == rhs.isDefault();
} }
bool HifiAudioDeviceInfo::operator!=(const HifiAudioDeviceInfo& rhs) const { bool HifiAudioDeviceInfo::operator!=(const HifiAudioDeviceInfo& rhs) const {
return getDevice() != rhs.getDevice() && isDefault() != rhs.isDefault(); return getDevice() != rhs.getDevice() || isDefault() != rhs.isDefault();
} }

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

@ -37,14 +37,14 @@ public:
} }
void setMode(QAudio::Mode mode) { _mode = mode; } void setMode(QAudio::Mode mode) { _mode = mode; }
void setIsDefault(bool isDefault = false) { _isDefault = isDefault; } void setIsDefault() { _isDefault = true; }
void setDevice(QAudioDeviceInfo devInfo); void setDevice(QAudioDeviceInfo devInfo);
QString deviceName() const { QString deviceName() const {
#if defined(Q_OS_ANDROID) #if defined(Q_OS_ANDROID)
return _audioDeviceInfo.deviceName(); return _audioDeviceInfo.deviceName();
#endif #endif
if (_isDefault) { if (_isDefault) {
return "default"; return DEFAULT_DEVICE_NAME;
} else { } else {
return _audioDeviceInfo.deviceName(); return _audioDeviceInfo.deviceName();
} }
@ -61,6 +61,9 @@ private:
QAudioDeviceInfo _audioDeviceInfo; QAudioDeviceInfo _audioDeviceInfo;
bool _isDefault { false }; bool _isDefault { false };
QAudio::Mode _mode { QAudio::AudioInput }; QAudio::Mode _mode { QAudio::AudioInput };
public:
static const QString DEFAULT_DEVICE_NAME;
}; };
#endif #endif