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

wip: sticky devices

Browse source
This commit is contained in:
Zach Pomerantz 2017-06-12 18:48:26 -04:00
parent b5dab39f83
commit 7d3bf75f0b
3 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -17,12 +17,12 @@
using namespace scripting; using namespace scripting;
static const QString DESKTOP_CONTEXT { "Desktop" }; QString Audio::AUDIO { "Audio" };
static const QString HMD_CONTEXT { "VR" }; QString Audio::DESKTOP { "Desktop" };
QString Audio::HMD { "VR" };
static const QString AUDIO { "Audio" }; Setting::Handle<bool> enableNoiseReductionSetting { QStringList { Audio::AUDIO, "NoiseReduction" }, true };
Setting::Handle<bool> enableNoiseReductionSetting { QStringList(AUDIO) << "NoiseReduction", true }; Setting::Handle<bool> showMicMeterSetting { QStringList { Audio::AUDIO, "MicMeter" }, false };
Setting::Handle<bool> showMicMeterSetting { QStringList(AUDIO) << "MicMeter", false };
Audio::Audio() { Audio::Audio() {
auto client = DependencyManager::get<AudioClient>(); auto client = DependencyManager::get<AudioClient>();
@ -52,7 +52,7 @@ void Audio::onChangedContext() {
} }
QString Audio::getContext() const { QString Audio::getContext() const {
return _contextIsHMD ? HMD_CONTEXT : DESKTOP_CONTEXT; return _contextIsHMD ? Audio::HMD : Audio::DESKTOP;
} }
void Audio::onChangedMuted() { void Audio::onChangedMuted() {

5
interface/src/scripting/Audio.h
View file

@ -31,6 +31,10 @@ class Audio : public AudioScriptingInterface {
Q_PROPERTY(AudioDevices* devices READ getDevices NOTIFY nop) Q_PROPERTY(AudioDevices* devices READ getDevices NOTIFY nop)
public: public:
static QString AUDIO;
static QString HMD;
static QString DESKTOP;
virtual ~Audio() {} virtual ~Audio() {}
bool isMuted() const { return _isMuted; } bool isMuted() const { return _isMuted; }
@ -65,6 +69,7 @@ protected:
Audio(); Audio();
private: private:
float _inputVolume { 1.0f }; float _inputVolume { 1.0f };
bool _isMuted { false }; bool _isMuted { false };
bool _enableNoiseReduction; bool _enableNoiseReduction;

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

@ -13,9 +13,18 @@
#include "Application.h" #include "Application.h"
#include "AudioClient.h" #include "AudioClient.h"
#include "Audio.h"
using namespace scripting; using namespace scripting;
const QString INPUT { "INPUT" };
const QString OUTPUT { "OUTPUT" };
Setting::Handle<QAudioDeviceInfo> desktopInputDevice { QStringList { Audio::AUDIO, Audio::DESKTOP, INPUT }};
Setting::Handle<QAudioDeviceInfo> desktopOutputDevice { QStringList { Audio::AUDIO, Audio::DESKTOP, OUTPUT }};
Setting::Handle<QAudioDeviceInfo> HMDInputDevice { QStringList { Audio::AUDIO, Audio::HMD, INPUT }};
Setting::Handle<QAudioDeviceInfo> HMDOutputDevice { QStringList { Audio::AUDIO, Audio::HMD, OUTPUT }};
QHash<int, QByteArray> AudioDeviceList::_roles { QHash<int, QByteArray> AudioDeviceList::_roles {
{ Qt::DisplayRole, "display" }, { Qt::DisplayRole, "display" },
{ Qt::CheckStateRole, "selected" } { Qt::CheckStateRole, "selected" }