From 30afadc7b712b49cbb6452087b4b3c89ba4716f2 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 4 Feb 2015 10:53:05 -0800 Subject: [PATCH] fixes for new settings API --- interface/src/ui/AnimationsDialog.cpp | 2 ++ interface/src/ui/PreferencesDialog.cpp | 4 ++-- libraries/audio-client/src/AudioClient.h | 3 +++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/interface/src/ui/AnimationsDialog.cpp b/interface/src/ui/AnimationsDialog.cpp index 6a181b6209..1586d9ebad 100644 --- a/interface/src/ui/AnimationsDialog.cpp +++ b/interface/src/ui/AnimationsDialog.cpp @@ -21,6 +21,8 @@ #include #include +#include "avatar/AvatarManager.h" + #include "AnimationsDialog.h" AnimationsDialog::AnimationsDialog(QWidget* parent) : diff --git a/interface/src/ui/PreferencesDialog.cpp b/interface/src/ui/PreferencesDialog.cpp index 7b9a195098..e27875ce67 100644 --- a/interface/src/ui/PreferencesDialog.cpp +++ b/interface/src/ui/PreferencesDialog.cpp @@ -154,7 +154,7 @@ void PreferencesDialog::loadPreferences() { ui.outputStarveDetectionThresholdSpinner->setValue(audio->getOutputStarveDetectionThreshold()); ui.outputStarveDetectionPeriodSpinner->setValue(audio->getOutputStarveDetectionPeriod()); - ui.realWorldFieldOfViewSpin->setValue(qApp->getAvatar()->getRealWorldFieldOfView()); + ui.realWorldFieldOfViewSpin->setValue(DependencyManager::get()->getMyAvatar()->getRealWorldFieldOfView()); ui.fieldOfViewSpin->setValue(qApp->getFieldOfView()); @@ -234,7 +234,7 @@ void PreferencesDialog::savePreferences() { auto glCanvas = DependencyManager::get(); Application::getInstance()->resizeGL(glCanvas->width(), glCanvas->height()); - qApp->getAvatar()->setRealWorldFieldOfView(ui.realWorldFieldOfViewSpin->value()); + DependencyManager::get()->getMyAvatar()->setRealWorldFieldOfView(ui.realWorldFieldOfViewSpin->value()); qApp->setFieldOfView(ui.fieldOfViewSpin->value()); diff --git a/libraries/audio-client/src/AudioClient.h b/libraries/audio-client/src/AudioClient.h index acac228dc4..ed487e4ea1 100644 --- a/libraries/audio-client/src/AudioClient.h +++ b/libraries/audio-client/src/AudioClient.h @@ -114,6 +114,9 @@ public: float getAudioOutputMsecsUnplayed() const; int getOutputBufferSize() { return _outputBufferSizeFrames.get(); } + + bool getOutputStarveDetectionEnabled() { return _outputStarveDetectionEnabled.get(); } + void setOutputStarveDetectionEnabled(bool enabled) { _outputStarveDetectionEnabled.set(enabled); } int getOutputStarveDetectionPeriod() { return _outputStarveDetectionPeriodMsec.get(); } void setOutputStarveDetectionPeriod(int msecs) { _outputStarveDetectionPeriodMsec.set(msecs); }