From 89bd895054844d52aff39d621140bb288d26b754 Mon Sep 17 00:00:00 2001 From: Zach Pomerantz Date: Tue, 13 Jun 2017 12:31:05 -0400 Subject: [PATCH] mv showAudioTools to just AvatarInputs --- interface/resources/qml/hifi/audio/Audio.qml | 6 +++--- interface/src/Application.cpp | 11 +---------- interface/src/scripting/Audio.cpp | 14 -------------- interface/src/scripting/Audio.h | 5 ----- interface/src/ui/AvatarInputs.cpp | 5 ++++- 5 files changed, 8 insertions(+), 33 deletions(-) diff --git a/interface/resources/qml/hifi/audio/Audio.qml b/interface/resources/qml/hifi/audio/Audio.qml index 2bb1ea5864..47022b5a0c 100644 --- a/interface/resources/qml/hifi/audio/Audio.qml +++ b/interface/resources/qml/hifi/audio/Audio.qml @@ -59,10 +59,10 @@ Rectangle { } Audio.CheckBox { text: qsTr("Show audio level meter"); - checked: Audio.showMicMeter + checked: AvatarInputs.showAudioTools onClicked: { - Audio.showMicMeter = checked; - checked = Qt.binding(function() { return Audio.showMicMeter; }); // restore binding + AvatarInputs.showAudioTools = checked; + checked = Qt.binding(function() { return AvatarInputs.showAudioTools }); // restore binding } } } diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 57f0409747..228001ce81 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -1924,16 +1924,7 @@ void Application::initializeUi() { rootContext->setContextProperty("ApplicationCompositor", &getApplicationCompositor()); - { - auto ai = AvatarInputs::getInstance(); - rootContext->setContextProperty("AvatarInputs", ai); - - // hook up audio - auto audio = reinterpret_cast(DependencyManager::get().data()); - connect(ai, &AvatarInputs::showAudioToolsChanged, audio, &scripting::Audio::onChangedMicMeter); - connect(audio, &scripting::Audio::changedMicMeter, ai, &AvatarInputs::setShowAudioTools); - ai->setShowAudioTools(audio->micMeterShown()); - } + rootContext->setContextProperty("AvatarInputs", AvatarInputs::getInstance()); if (auto steamClient = PluginManager::getInstance()->getSteamClientPlugin()) { rootContext->setContextProperty("Steam", new SteamScriptingInterface(engine, steamClient.get())); diff --git a/interface/src/scripting/Audio.cpp b/interface/src/scripting/Audio.cpp index bfad9a7a29..2ff09698b2 100644 --- a/interface/src/scripting/Audio.cpp +++ b/interface/src/scripting/Audio.cpp @@ -22,7 +22,6 @@ QString Audio::DESKTOP { "Desktop" }; QString Audio::HMD { "VR" }; Setting::Handle enableNoiseReductionSetting { QStringList { Audio::AUDIO, "NoiseReduction" }, true }; -Setting::Handle showMicMeterSetting { QStringList { Audio::AUDIO, "MicMeter" }, false }; Audio::Audio() { auto client = DependencyManager::get(); @@ -31,7 +30,6 @@ Audio::Audio() { connect(&_devices._inputs, &AudioDeviceList::deviceChanged, this, &Audio::onInputChanged); enableNoiseReduction(enableNoiseReductionSetting.get()); - _showMicMeter = showMicMeterSetting.get(); } void Audio::setReverb(bool enable) { @@ -87,18 +85,6 @@ void Audio::enableNoiseReduction(bool enable) { } } -void Audio::onChangedMicMeter(bool show) { - showMicMeter(show); -} - -void Audio::showMicMeter(bool show) { - if (_showMicMeter != show) { - showMicMeterSetting.set(show); - _showMicMeter = show; - emit changedMicMeter(show); - } -} - void Audio::setInputVolume(float volume) { // getInputVolume will not reflect changes synchronously, so clamp beforehand volume = glm::clamp(volume, 0.0f, 1.0f); diff --git a/interface/src/scripting/Audio.h b/interface/src/scripting/Audio.h index 86c68de7b8..a7220da985 100644 --- a/interface/src/scripting/Audio.h +++ b/interface/src/scripting/Audio.h @@ -25,7 +25,6 @@ class Audio : public AudioScriptingInterface { Q_PROPERTY(bool muted READ isMuted WRITE setMuted NOTIFY changedMuted) Q_PROPERTY(bool noiseReduction READ noiseReductionEnabled WRITE enableNoiseReduction NOTIFY changedNoiseReduction) - Q_PROPERTY(bool showMicMeter READ micMeterShown WRITE showMicMeter NOTIFY changedMicMeter) Q_PROPERTY(float inputVolume READ getInputVolume WRITE setInputVolume NOTIFY changedInputVolume) Q_PROPERTY(QString context READ getContext NOTIFY changedContext) Q_PROPERTY(AudioDevices* devices READ getDevices NOTIFY nop) @@ -39,7 +38,6 @@ public: bool isMuted() const { return _isMuted; } bool noiseReductionEnabled() const { return _enableNoiseReduction; } - bool micMeterShown() const { return _showMicMeter; } float getInputVolume() const { return _inputVolume; } QString getContext() const; @@ -55,13 +53,11 @@ signals: void nop(); void changedMuted(bool); void changedNoiseReduction(bool); - void changedMicMeter(bool); void changedInputVolume(float); void changedContext(QString); public slots: void onChangedMuted(); - void onChangedMicMeter(bool); void onChangedContext(); void onInputChanged(); @@ -73,7 +69,6 @@ private: float _inputVolume { 1.0f }; bool _isMuted { false }; bool _enableNoiseReduction; - bool _showMicMeter; bool _contextIsHMD { false }; AudioDevices* getDevices() { return &_devices; } diff --git a/interface/src/ui/AvatarInputs.cpp b/interface/src/ui/AvatarInputs.cpp index 8236c9196f..7a46aded77 100644 --- a/interface/src/ui/AvatarInputs.cpp +++ b/interface/src/ui/AvatarInputs.cpp @@ -18,9 +18,10 @@ HIFI_QML_DEF(AvatarInputs) - static AvatarInputs* INSTANCE{ nullptr }; +Setting::Handle showAudioToolsSetting { QStringList { "AvatarInputs", "showAudioTools" }, false }; + AvatarInputs* AvatarInputs::getInstance() { if (!INSTANCE) { AvatarInputs::registerType(); @@ -32,6 +33,7 @@ AvatarInputs* AvatarInputs::getInstance() { AvatarInputs::AvatarInputs(QQuickItem* parent) : QQuickItem(parent) { INSTANCE = this; + _showAudioTools = showAudioToolsSetting.get(); } #define AI_UPDATE(name, src) \ @@ -111,6 +113,7 @@ void AvatarInputs::setShowAudioTools(bool showAudioTools) { return; _showAudioTools = showAudioTools; + showAudioToolsSetting.set(_showAudioTools); emit showAudioToolsChanged(_showAudioTools); }