Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 05:05:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Temporary patch for deadlock

Browse source
This commit is contained in:
Brad Davis 2017-07-20 17:06:36 -07:00
parent c128a3ff86
commit d1c2218a31
1 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -63,6 +63,14 @@ QVariant AudioDeviceList::data(const QModelIndex& index, int role) const {
void AudioDeviceList::resetDevice(bool contextIsHMD, const QString& device) { void AudioDeviceList::resetDevice(bool contextIsHMD, const QString& device) {
auto client = DependencyManager::get<AudioClient>().data(); auto client = DependencyManager::get<AudioClient>().data();
auto deviceName = getSetting(contextIsHMD, _mode).get(); auto deviceName = getSetting(contextIsHMD, _mode).get();
// FIXME hack to prevent deadlock on startup. The real fix will be to have the
// audio client emit success and failure messages in response to audio device
// switches made here
#if 1
QMetaObject::invokeMethod(client, "switchAudioDevice",
Q_ARG(QAudio::Mode, _mode), Q_ARG(QString, deviceName));
#else
bool switchResult = false; bool switchResult = false;
QMetaObject::invokeMethod(client, "switchAudioDevice", Qt::BlockingQueuedConnection, QMetaObject::invokeMethod(client, "switchAudioDevice", Qt::BlockingQueuedConnection,
Q_RETURN_ARG(bool, switchResult), Q_RETURN_ARG(bool, switchResult),
@ -85,6 +93,7 @@ void AudioDeviceList::resetDevice(bool contextIsHMD, const QString& device) {
QMetaObject::invokeMethod(client, "switchAudioDevice", Q_ARG(QAudio::Mode, _mode)); QMetaObject::invokeMethod(client, "switchAudioDevice", Q_ARG(QAudio::Mode, _mode));
} }
} }
#endif
} }
void AudioDeviceList::onDeviceChanged(const QAudioDeviceInfo& device) { void AudioDeviceList::onDeviceChanged(const QAudioDeviceInfo& device) {
@ -201,6 +210,14 @@ void AudioDevices::onDevicesChanged(QAudio::Mode mode, const QList<QAudioDeviceI
void AudioDevices::chooseInputDevice(const QAudioDeviceInfo& device) { void AudioDevices::chooseInputDevice(const QAudioDeviceInfo& device) {
auto client = DependencyManager::get<AudioClient>(); auto client = DependencyManager::get<AudioClient>();
// FIXME hack to prevent deadlock on startup
#if 1
QMetaObject::invokeMethod(client.data(), "switchAudioDevice",
Q_ARG(QAudio::Mode, QAudio::AudioInput),
Q_ARG(const QAudioDeviceInfo&, device));
onDeviceSelected(QAudio::AudioInput, device, _inputs._selectedDevice);
#else
bool success = false; bool success = false;
QMetaObject::invokeMethod(client.data(), "switchAudioDevice", QMetaObject::invokeMethod(client.data(), "switchAudioDevice",
Qt::BlockingQueuedConnection, Qt::BlockingQueuedConnection,
@ -211,6 +228,7 @@ void AudioDevices::chooseInputDevice(const QAudioDeviceInfo& device) {
if (success) { if (success) {
onDeviceSelected(QAudio::AudioInput, device, _inputs._selectedDevice); onDeviceSelected(QAudio::AudioInput, device, _inputs._selectedDevice);
} }
#endif
} }
void AudioDevices::chooseOutputDevice(const QAudioDeviceInfo& device) { void AudioDevices::chooseOutputDevice(const QAudioDeviceInfo& device) {