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

addressing comments

Browse source
This commit is contained in:
amerhifi 2019-10-22 07:17:57 -07:00
parent 68681fdb2e
commit a8602195d4
7 changed files with 19 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -62,12 +62,6 @@ static QString getTargetDevice(bool hmd, QAudio::Mode mode) {
auto& setting = getSetting(hmd, mode); auto& setting = getSetting(hmd, mode);
if (setting.isSet()) { if (setting.isSet()) {
deviceName = setting.get(); deviceName = setting.get();
} else if (hmd) {
if (mode == QAudio::AudioInput) {
deviceName = qApp->getActiveDisplayPlugin()->getPreferredAudioInDevice();
} else { // if (_mode == QAudio::AudioOutput)
deviceName = qApp->getActiveDisplayPlugin()->getPreferredAudioOutDevice();
}
} else { } else {
deviceName = HifiAudioDeviceInfo::DEFAULT_DEVICE_NAME; deviceName = HifiAudioDeviceInfo::DEFAULT_DEVICE_NAME;
} }
@ -269,13 +263,15 @@ void AudioDeviceList::onDevicesChanged(const QList<HifiAudioDeviceInfo>& devices
bool hmdIsSelected = false; bool hmdIsSelected = false;
bool desktopIsSelected = false; bool desktopIsSelected = false;
foreach(const HifiAudioDeviceInfo& deviceInfo, devices) { if (!_backupSelectedDesktopDeviceName.isEmpty() && !_backupSelectedHMDDeviceName.isEmpty()) {
for (bool isHMD : {false, true}) { foreach(const HifiAudioDeviceInfo& deviceInfo, devices) {
auto& backupSelectedDeviceName = isHMD ? _backupSelectedHMDDeviceName : _backupSelectedDesktopDeviceName; for (bool isHMD : {false, true}) {
if (deviceInfo.deviceName() == backupSelectedDeviceName) { auto& backupSelectedDeviceName = isHMD ? _backupSelectedHMDDeviceName : _backupSelectedDesktopDeviceName;
HifiAudioDeviceInfo& selectedDevice = isHMD ? _selectedHMDDevice : _selectedDesktopDevice; if (deviceInfo.deviceName() == backupSelectedDeviceName) {
selectedDevice = deviceInfo; HifiAudioDeviceInfo& selectedDevice = isHMD ? _selectedHMDDevice : _selectedDesktopDevice;
backupSelectedDeviceName.clear(); selectedDevice = deviceInfo;
backupSelectedDeviceName.clear();
}
} }
} }
} }

1
libraries/audio-client/CMakeLists.txt
View file

@ -7,6 +7,7 @@ link_hifi_libraries(audio plugins)
include_hifi_library_headers(shared) include_hifi_library_headers(shared)
include_hifi_library_headers(networking) include_hifi_library_headers(networking)
include_hifi_library_headers(gpu) include_hifi_library_headers(gpu)
if (ANDROID) if (ANDROID)
else () else ()
target_webrtc() target_webrtc()

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

@ -39,6 +39,7 @@
#include <QtMultimedia/QAudioInput> #include <QtMultimedia/QAudioInput>
#include <QtMultimedia/QAudioOutput> #include <QtMultimedia/QAudioOutput>
#include <shared/QtHelpers.h>
#include <ThreadHelpers.h> #include <ThreadHelpers.h>
#include <NodeList.h> #include <NodeList.h>
#include <plugins/CodecPlugin.h> #include <plugins/CodecPlugin.h>
@ -48,6 +49,7 @@
#include <SharedUtil.h> #include <SharedUtil.h>
#include <Transform.h> #include <Transform.h>
#include <plugins/DisplayPlugin.h> #include <plugins/DisplayPlugin.h>
#include "AudioClientLogging.h" #include "AudioClientLogging.h"
#include "AudioLogging.h" #include "AudioLogging.h"
#include "AudioHelpers.h" #include "AudioHelpers.h"
@ -81,7 +83,7 @@ Mutex _recordMutex;
HifiAudioDeviceInfo defaultAudioDeviceForMode(QAudio::Mode mode); HifiAudioDeviceInfo defaultAudioDeviceForMode(QAudio::Mode mode);
#include <shared/QtHelpers.h>
static QString getHmdAudioDeviceName(QAudio::Mode mode) { static QString getHmdAudioDeviceName(QAudio::Mode mode) {
foreach(DisplayPluginPointer displayPlugin, PluginManager::getInstance()->getAllDisplayPlugins()) { foreach(DisplayPluginPointer displayPlugin, PluginManager::getInstance()->getAllDisplayPlugins()) {
if (displayPlugin && displayPlugin->isHmd()) { if (displayPlugin && displayPlugin->isHmd()) {
@ -568,7 +570,7 @@ HifiAudioDeviceInfo defaultAudioDeviceForMode(QAudio::Mode mode) {
HifiAudioDeviceInfo foundDevice; HifiAudioDeviceInfo foundDevice;
foreach(QAudioDeviceInfo audioDevice, devices) { foreach(QAudioDeviceInfo audioDevice, devices) {
if (audioDevice.deviceName().trimmed() == deviceName.trimmed()) { if (audioDevice.deviceName().trimmed() == deviceName.trimmed()) {
foundDevice=HifiAudioDeviceInfo(audioDevice,true,mode, HifiAudioDeviceInfo::desktop); foundDevice=HifiAudioDeviceInfo(audioDevice, true, mode, HifiAudioDeviceInfo::desktop);
break; break;
} }
} }
@ -594,7 +596,7 @@ HifiAudioDeviceInfo defaultAudioDeviceForMode(QAudio::Mode mode) {
} }
#endif #endif
// fallback for failed lookup is the default device // fallback for failed lookup is the default device
return (mode == QAudio::AudioInput) ? HifiAudioDeviceInfo(QAudioDeviceInfo::defaultInputDevice(), true,mode, HifiAudioDeviceInfo::desktop) : return (mode == QAudio::AudioInput) ? HifiAudioDeviceInfo(QAudioDeviceInfo::defaultInputDevice(), true, mode, HifiAudioDeviceInfo::desktop) :
HifiAudioDeviceInfo(QAudioDeviceInfo::defaultOutputDevice(), true, mode, HifiAudioDeviceInfo::desktop); HifiAudioDeviceInfo(QAudioDeviceInfo::defaultOutputDevice(), true, mode, HifiAudioDeviceInfo::desktop);
} }

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

@ -32,5 +32,4 @@ bool HifiAudioDeviceInfo::operator==(const HifiAudioDeviceInfo& rhs) const {
} }
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();
} }

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

@ -37,7 +37,6 @@ public:
_deviceType = deviceInfo.getDeviceType(); _deviceType = deviceInfo.getDeviceType();
} }
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),
@ -66,7 +65,6 @@ public:
bool operator==(const HifiAudioDeviceInfo& rhs) const; bool operator==(const HifiAudioDeviceInfo& rhs) const;
bool operator!=(const HifiAudioDeviceInfo& rhs) const; bool operator!=(const HifiAudioDeviceInfo& rhs) const;
private: private:
QAudioDeviceInfo _audioDeviceInfo; QAudioDeviceInfo _audioDeviceInfo;
bool _isDefault { false }; bool _isDefault { false };

6
libraries/plugins/src/plugins/PluginManager.cpp
View file

@ -13,6 +13,7 @@
#include <QtCore/QDir> #include <QtCore/QDir>
#include <QtCore/QDebug> #include <QtCore/QDebug>
#include <QtCore/QPluginLoader> #include <QtCore/QPluginLoader>
#include <shared/QtHelpers.h>
//#define HIFI_PLUGINMANAGER_DEBUG //#define HIFI_PLUGINMANAGER_DEBUG
#if defined(HIFI_PLUGINMANAGER_DEBUG) #if defined(HIFI_PLUGINMANAGER_DEBUG)
@ -21,6 +22,7 @@
#include <DependencyManager.h> #include <DependencyManager.h>
#include <UserActivityLogger.h> #include <UserActivityLogger.h>
#include <QThreadPool>
#include "RuntimePlugin.h" #include "RuntimePlugin.h"
#include "CodecPlugin.h" #include "CodecPlugin.h"
@ -221,10 +223,6 @@ const OculusPlatformPluginPointer PluginManager::getOculusPlatformPlugin() {
return oculusPlatformPlugin; return oculusPlatformPlugin;
} }
#include <shared/QtHelpers.h>
#include <QThreadPool>
DisplayPluginList PluginManager::getAllDisplayPlugins() { DisplayPluginList PluginManager::getAllDisplayPlugins() {
if (thread() != QThread::currentThread()) { if (thread() != QThread::currentThread()) {
DisplayPluginList list; DisplayPluginList list;

1
libraries/plugins/src/plugins/PluginManager.h
View file

@ -52,6 +52,7 @@ public:
using PluginFilter = std::function<bool(const QJsonObject&)>; using PluginFilter = std::function<bool(const QJsonObject&)>;
void setPluginFilter(PluginFilter pluginFilter) { _pluginFilter = pluginFilter; } void setPluginFilter(PluginFilter pluginFilter) { _pluginFilter = pluginFilter; }
Q_INVOKABLE DisplayPluginList getAllDisplayPlugins(); Q_INVOKABLE DisplayPluginList getAllDisplayPlugins();
signals: signals:
void inputDeviceRunningChanged(const QString& pluginName, bool isRunning, const QStringList& runningDevices); void inputDeviceRunningChanged(const QString& pluginName, bool isRunning, const QStringList& runningDevices);