From 8436d0cc6b03922089796806fdb02a1e44d5b92b Mon Sep 17 00:00:00 2001 From: Zach Pomerantz Date: Tue, 20 Jun 2017 11:02:54 -0700 Subject: [PATCH] rm unused AvatarInputs props --- interface/src/ui/AvatarInputs.cpp | 34 ------------------------------- interface/src/ui/AvatarInputs.h | 7 ------- 2 files changed, 41 deletions(-) diff --git a/interface/src/ui/AvatarInputs.cpp b/interface/src/ui/AvatarInputs.cpp index 7a46aded77..ccac6d7207 100644 --- a/interface/src/ui/AvatarInputs.cpp +++ b/interface/src/ui/AvatarInputs.cpp @@ -45,15 +45,6 @@ AvatarInputs::AvatarInputs(QQuickItem* parent) : QQuickItem(parent) { } \ } -#define AI_UPDATE_FLOAT(name, src, epsilon) \ - { \ - float val = src; \ - if (fabsf(_##name - val) >= epsilon) { \ - _##name = val; \ - emit name##Changed(); \ - } \ - } - float AvatarInputs::loudnessToAudioLevel(float loudness) { const float AUDIO_METER_AVERAGING = 0.5; const float LOG2 = log(2.0f); @@ -85,27 +76,6 @@ void AvatarInputs::update() { AI_UPDATE(cameraEnabled, !Menu::getInstance()->isOptionChecked(MenuOption::NoFaceTracking)); AI_UPDATE(cameraMuted, Menu::getInstance()->isOptionChecked(MenuOption::MuteFaceTracking)); AI_UPDATE(isHMD, qApp->isHMDMode()); - - auto audioIO = DependencyManager::get(); - - const float audioLevel = loudnessToAudioLevel(DependencyManager::get()->getLastInputLoudness()); - - AI_UPDATE_FLOAT(audioLevel, audioLevel, 0.01f); - AI_UPDATE(audioClipping, ((audioIO->getTimeSinceLastClip() > 0.0f) && (audioIO->getTimeSinceLastClip() < 1.0f))); - AI_UPDATE(audioMuted, audioIO->isMuted()); - - //// Make muted icon pulsate - //static const float PULSE_MIN = 0.4f; - //static const float PULSE_MAX = 1.0f; - //static const float PULSE_FREQUENCY = 1.0f; // in Hz - //qint64 now = usecTimestampNow(); - //if (now - _iconPulseTimeReference > (qint64)USECS_PER_SECOND) { - // // Prevents t from getting too big, which would diminish glm::cos precision - // _iconPulseTimeReference = now - ((now - _iconPulseTimeReference) % USECS_PER_SECOND); - //} - //float t = (float)(now - _iconPulseTimeReference) / (float)USECS_PER_SECOND; - //float pulseFactor = (glm::cos(t * PULSE_FREQUENCY * 2.0f * PI) + 1.0f) / 2.0f; - //iconColor = PULSE_MIN + (PULSE_MAX - PULSE_MIN) * pulseFactor; } void AvatarInputs::setShowAudioTools(bool showAudioTools) { @@ -124,10 +94,6 @@ void AvatarInputs::toggleCameraMute() { } } -void AvatarInputs::toggleAudioMute() { - DependencyManager::get()->toggleMute(); -} - void AvatarInputs::resetSensors() { qApp->resetSensors(); } diff --git a/interface/src/ui/AvatarInputs.h b/interface/src/ui/AvatarInputs.h index 247cc54995..fb48df9d73 100644 --- a/interface/src/ui/AvatarInputs.h +++ b/interface/src/ui/AvatarInputs.h @@ -25,9 +25,6 @@ class AvatarInputs : public QQuickItem { AI_PROPERTY(bool, cameraEnabled, false) AI_PROPERTY(bool, cameraMuted, false) - AI_PROPERTY(bool, audioMuted, false) - AI_PROPERTY(bool, audioClipping, false) - AI_PROPERTY(float, audioLevel, 0) AI_PROPERTY(bool, isHMD, false) Q_PROPERTY(bool showAudioTools READ showAudioTools WRITE setShowAudioTools NOTIFY showAudioToolsChanged) @@ -45,16 +42,12 @@ public slots: signals: void cameraEnabledChanged(); void cameraMutedChanged(); - void audioMutedChanged(); - void audioClippingChanged(); - void audioLevelChanged(); void isHMDChanged(); void showAudioToolsChanged(bool show); protected: Q_INVOKABLE void resetSensors(); Q_INVOKABLE void toggleCameraMute(); - Q_INVOKABLE void toggleAudioMute(); private: float _trailingAudioLoudness{ 0 };