Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 14:52:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

working on swapping default devices on system change

Browse source
This commit is contained in:
amerhifi 2019-09-17 07:50:22 -07:00
parent e689531410
commit 66725f5f1b
3 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -121,6 +121,8 @@ AudioDeviceList::~AudioDeviceList() {
// store the selected device // store the selected device
foreach(std::shared_ptr<AudioDevice> adevice, _devices) { foreach(std::shared_ptr<AudioDevice> adevice, _devices) {
if (adevice->selectedDesktop) { if (adevice->selectedDesktop) {
qDebug() << "AMER ----> " << adevice->info.getId();
qDebug() << " AMER-------------> " << adevice->info.deviceName();
settingDesktop.set(adevice->info.deviceName()); settingDesktop.set(adevice->info.deviceName());
} }
if (adevice->selectedHMD) { if (adevice->selectedHMD) {

28
libraries/audio-client/src/AudioClient.cpp
View file

@ -119,6 +119,31 @@ void AudioClient::checkDevices() {
auto inputDevices = getAvailableDevices(QAudio::AudioInput); auto inputDevices = getAvailableDevices(QAudio::AudioInput);
auto outputDevices = getAvailableDevices(QAudio::AudioOutput); auto outputDevices = getAvailableDevices(QAudio::AudioOutput);
{
Lock lock(_deviceMutex);
//is the current device the default selected device?
if (_inputDeviceInfo.isDefault() && _inputDeviceInfo == _defaultInputDevice) {
auto defInput = defaultAudioDeviceForMode(QAudio::AudioInput);
//Has the default device changed
if (_defaultInputDevice.getDevice() != defInput.getDevice()) {
qDebug() << "Changing Current Default device " << _defaultInputDevice.getAudioDeviceName();
_defaultInputDevice.setDevice(defInput.getDevice());
qDebug() << "NEW Default device " << _defaultInputDevice.getAudioDeviceName();
QMetaObject::invokeMethod(this, "switchInputToAudioDevice", Qt::QueuedConnection, Q_ARG(HifiAudioDeviceInfo, _defaultInputDevice));
}
}
if (_outputDeviceInfo.isDefault() && _inputDeviceInfo == _defaultInputDevice) {
auto defOutput = defaultAudioDeviceForMode(QAudio::AudioOutput);
if (_defaultOutputDevice.getDevice() != defOutput.getDevice()) {
_defaultOutputDevice.setDevice(defOutput.getDevice());
QMetaObject::invokeMethod(this, "switchOutputToAudioDevice", Qt::QueuedConnection, Q_ARG(HifiAudioDeviceInfo, _defaultOutputDevice));
}
}
}
//add the pseudo device to the list of devices //add the pseudo device to the list of devices
inputDevices.push_front(_defaultInputDevice); inputDevices.push_front(_defaultInputDevice);
outputDevices.push_front(_defaultOutputDevice); outputDevices.push_front(_defaultOutputDevice);
@ -342,19 +367,16 @@ AudioClient::AudioClient() :
connect(&_receivedAudioStream, &InboundAudioStream::mismatchedAudioCodec, this, &AudioClient::handleMismatchAudioFormat); connect(&_receivedAudioStream, &InboundAudioStream::mismatchedAudioCodec, this, &AudioClient::handleMismatchAudioFormat);
_defaultOutputDevice = defaultAudioDeviceForMode(QAudio::AudioOutput); _defaultOutputDevice = defaultAudioDeviceForMode(QAudio::AudioOutput);
_defaultOutputDevice.setDeviceName("Default audio (recommended)"); _defaultOutputDevice.setDeviceName("Default audio (recommended)");
_defaultOutputDevice.setIsDefault(true); _defaultOutputDevice.setIsDefault(true);
_defaultOutputDevice.setMode(QAudio::AudioOutput); _defaultOutputDevice.setMode(QAudio::AudioOutput);
_defaultInputDevice = defaultAudioDeviceForMode(QAudio::AudioInput); _defaultInputDevice = defaultAudioDeviceForMode(QAudio::AudioInput);
_defaultInputDevice.setDeviceName("Default microphone (recommended)"); _defaultInputDevice.setDeviceName("Default microphone (recommended)");
_defaultInputDevice.setIsDefault(true); _defaultInputDevice.setIsDefault(true);
_defaultInputDevice.setMode(QAudio::AudioInput); _defaultInputDevice.setMode(QAudio::AudioInput);
// initialize wasapi; if getAvailableDevices is called from the CheckDevicesThread before this, it will crash // initialize wasapi; if getAvailableDevices is called from the CheckDevicesThread before this, it will crash
getAvailableDevices(QAudio::AudioInput); getAvailableDevices(QAudio::AudioInput);
getAvailableDevices(QAudio::AudioOutput); getAvailableDevices(QAudio::AudioOutput);

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

@ -36,7 +36,7 @@ public:
} }
void setDevice(QAudioDeviceInfo devInfo); void setDevice(QAudioDeviceInfo devInfo);
void setId(QString name); void setId(QString name);
QString getAudioDeviceName() { return _audioDeviceInfo.deviceName(); }
QString getId() const { return _uniqueId; } QString getId() const { return _uniqueId; }
QAudioDeviceInfo getDevice() const { return _audioDeviceInfo; } QAudioDeviceInfo getDevice() const { return _audioDeviceInfo; }
QString deviceName() const { return _deviceName; } QString deviceName() const { return _deviceName; }