From 983a0ccb9b7b414bfba08eec8a20c1e1caf96944 Mon Sep 17 00:00:00 2001 From: Howard Stearns Date: Tue, 16 Feb 2016 18:00:39 -0800 Subject: [PATCH] Change internal preference names so that old users pick up the new default values, and change name in dialog. --- interface/src/ui/PreferencesDialog.cpp | 2 +- libraries/audio-client/src/AudioClient.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/interface/src/ui/PreferencesDialog.cpp b/interface/src/ui/PreferencesDialog.cpp index b1812b7bd3..fad1b6be31 100644 --- a/interface/src/ui/PreferencesDialog.cpp +++ b/interface/src/ui/PreferencesDialog.cpp @@ -270,7 +270,7 @@ void setupPreferences() { { auto getter = []()->float { return DependencyManager::get()->getOutputBufferSize(); }; auto setter = [](float value) { DependencyManager::get()->setOutputBufferSize(value); }; - auto preference = new SpinnerPreference(AUDIO, "Output Buffer Size (frames)", getter, setter); + auto preference = new SpinnerPreference(AUDIO, "Output Buffer Initial Size (frames)", getter, setter); preference->setMin(1); preference->setMax(20); preference->setStep(1); diff --git a/libraries/audio-client/src/AudioClient.cpp b/libraries/audio-client/src/AudioClient.cpp index f7dc0c65bb..bcd9c91b24 100644 --- a/libraries/audio-client/src/AudioClient.cpp +++ b/libraries/audio-client/src/AudioClient.cpp @@ -80,9 +80,9 @@ AudioClient::AudioClient() : _isStereoInput(false), _outputStarveDetectionStartTimeMsec(0), _outputStarveDetectionCount(0), - _outputBufferSizeFrames("audioOutputBufferSize", DEFAULT_AUDIO_OUTPUT_BUFFER_SIZE_FRAMES), + _outputBufferSizeFrames("audioOutputBufferSizeFrames", DEFAULT_AUDIO_OUTPUT_BUFFER_SIZE_FRAMES), _sessionOutputBufferSizeFrames(_outputBufferSizeFrames.get()), - _outputStarveDetectionEnabled("audioOutputStarveDetectionEnabled", + _outputStarveDetectionEnabled("audioOutputBufferStarveDetectionEnabled", DEFAULT_AUDIO_OUTPUT_STARVE_DETECTION_ENABLED), _outputStarveDetectionPeriodMsec("audioOutputStarveDetectionPeriod", DEFAULT_AUDIO_OUTPUT_STARVE_DETECTION_PERIOD),