From d113b3f85c67a0ec8dd583b18005b6913e79dd8c Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Wed, 7 Jan 2015 09:48:41 -0800
Subject: [PATCH] Update getAudio() calls to use DependencyManager instead

---
 interface/src/Menu.cpp                 | 4 ++--
 interface/src/ui/PreferencesDialog.cpp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index 684041c3d9..240b752f71 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -657,7 +657,7 @@ void Menu::loadSettings(QSettings* settings) {
     _receivedAudioStreamSettings._windowSecondsForDesiredReduction = settings->value("windowSecondsForDesiredReduction", DEFAULT_WINDOW_SECONDS_FOR_DESIRED_REDUCTION).toInt();
     _receivedAudioStreamSettings._repetitionWithFade = settings->value("repetitionWithFade", DEFAULT_REPETITION_WITH_FADE).toBool();
 
-    Audio* audio = Application::getInstance()->getAudio();
+    Audio* audio = DependencyManager::get<Audio>();
     audio->setOutputStarveDetectionEnabled(settings->value("audioOutputStarveDetectionEnabled", DEFAULT_AUDIO_OUTPUT_STARVE_DETECTION_ENABLED).toBool());
     audio->setOutputStarveDetectionThreshold(settings->value("audioOutputStarveDetectionThreshold", DEFAULT_AUDIO_OUTPUT_STARVE_DETECTION_THRESHOLD).toInt());
     audio->setOutputStarveDetectionPeriod(settings->value("audioOutputStarveDetectionPeriod", DEFAULT_AUDIO_OUTPUT_STARVE_DETECTION_PERIOD).toInt());
@@ -731,7 +731,7 @@ void Menu::saveSettings(QSettings* settings) {
     settings->setValue("windowSecondsForDesiredReduction", _receivedAudioStreamSettings._windowSecondsForDesiredReduction);
     settings->setValue("repetitionWithFade", _receivedAudioStreamSettings._repetitionWithFade);
 
-    Audio* audio = Application::getInstance()->getAudio();
+    Audio* audio = DependencyManager::get<Audio>();
     settings->setValue("audioOutputStarveDetectionEnabled", audio->getOutputStarveDetectionEnabled());
     settings->setValue("audioOutputStarveDetectionThreshold", audio->getOutputStarveDetectionThreshold());
     settings->setValue("audioOutputStarveDetectionPeriod", audio->getOutputStarveDetectionPeriod());
diff --git a/interface/src/ui/PreferencesDialog.cpp b/interface/src/ui/PreferencesDialog.cpp
index d525917091..bbf34437a4 100644
--- a/interface/src/ui/PreferencesDialog.cpp
+++ b/interface/src/ui/PreferencesDialog.cpp
@@ -254,7 +254,7 @@ void PreferencesDialog::savePreferences() {
     streamSettings._windowSecondsForDesiredReduction = ui.windowSecondsForDesiredReductionSpin->value();
     streamSettings._repetitionWithFade = ui.repetitionWithFadeCheckBox->isChecked();
 
-    Audio* audio = Application::getInstance()->getAudio();
+    Audio* audio = DependencyManager::get<Audio>();
 
     Menu::getInstance()->setReceivedAudioStreamSettings(streamSettings);
 
@@ -265,7 +265,7 @@ void PreferencesDialog::savePreferences() {
     audio->setOutputStarveDetectionThreshold(ui.outputStarveDetectionThresholdSpinner->value());
     audio->setOutputStarveDetectionPeriod(ui.outputStarveDetectionPeriodSpinner->value());
 
-    DependencyManager::get<Audio>()->setReceivedAudioStreamSettings(streamSettings);
+    audio->setReceivedAudioStreamSettings(streamSettings);
 
     Application::getInstance()->resizeGL(glCanvas->width(), glCanvas->height());