From 7cb38d22c33e6ff2eb9be8ea3157cf4aa695b12c Mon Sep 17 00:00:00 2001 From: Zach Pomerantz Date: Mon, 5 Jun 2017 15:03:26 -0400 Subject: [PATCH] fix AudioBuffers to work in tablet --- .../resources/qml/hifi/dialogs/AudioBuffers.qml | 4 ++-- ...AudioPreferences.qml => TabletAudioBuffers.qml} | 12 ++++++------ interface/src/Menu.cpp | 2 +- interface/src/ui/PreferencesDialog.cpp | 14 +++++++------- 4 files changed, 16 insertions(+), 16 deletions(-) rename interface/resources/qml/hifi/tablet/{TabletAudioPreferences.qml => TabletAudioBuffers.qml} (71%) diff --git a/interface/resources/qml/hifi/dialogs/AudioBuffers.qml b/interface/resources/qml/hifi/dialogs/AudioBuffers.qml index f3b0e4575c..42e0781adc 100644 --- a/interface/resources/qml/hifi/dialogs/AudioBuffers.qml +++ b/interface/resources/qml/hifi/dialogs/AudioBuffers.qml @@ -5,9 +5,9 @@ import "../../dialogs" PreferencesDialog { id: root - objectName: "AudioPreferencesDialog" + objectName: "AudioBuffersDialog" title: "Audio Settings" - showCategories: ["Audio"] + showCategories: ["Audio Buffers"] property var settings: Settings { category: root.objectName property alias x: root.x diff --git a/interface/resources/qml/hifi/tablet/TabletAudioPreferences.qml b/interface/resources/qml/hifi/tablet/TabletAudioBuffers.qml similarity index 71% rename from interface/resources/qml/hifi/tablet/TabletAudioPreferences.qml rename to interface/resources/qml/hifi/tablet/TabletAudioBuffers.qml index 2046071e4c..b7f9089e6f 100644 --- a/interface/resources/qml/hifi/tablet/TabletAudioPreferences.qml +++ b/interface/resources/qml/hifi/tablet/TabletAudioBuffers.qml @@ -1,7 +1,7 @@ // -// TabletAudioPreferences.qml +// TabletAudioBuffers.qml // -// Created by Davd Rowe on 7 Mar 2017. +// Created by Zach Pomerantz on 6/5/2017. // Copyright 2017 High Fidelity, Inc. // // Distributed under the Apache License, Version 2.0. @@ -17,8 +17,8 @@ StackView { id: profileRoot initialItem: root objectName: "stack" - property string title: "Audio Settings" - + property string title: "Audio Buffers" + property alias gotoPreviousApp: root.gotoPreviousApp; property var eventBridge; signal sendToScript(var message); @@ -32,7 +32,7 @@ StackView { TabletPreferencesDialog { id: root - objectName: "TabletAudioPreferences" - showCategories: ["Audio"] + objectName: "TabletAudioBuffersDialog" + showCategories: ["Audio Buffers"] } } diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index baeae1a633..62f67a0beb 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -615,7 +615,7 @@ Menu::Menu() { action = addActionToQMenuAndActionHash(audioDebugMenu, "Buffers..."); connect(action, &QAction::triggered, [] { qApp->showDialog(QString("hifi/dialogs/AudioBuffers.qml"), - QString("../../hifi/dialogs/AudioBuffers.qml"), "AudioPreferencesDialog"); + QString("../../hifi/tablet/TabletAudioBuffers.qml"), "AudioBuffersDialog"); }); auto audioIO = DependencyManager::get(); diff --git a/interface/src/ui/PreferencesDialog.cpp b/interface/src/ui/PreferencesDialog.cpp index 767c122bb6..41a4ebdf68 100644 --- a/interface/src/ui/PreferencesDialog.cpp +++ b/interface/src/ui/PreferencesDialog.cpp @@ -227,17 +227,17 @@ void setupPreferences() { preferences->addPreference(preference); } - static const QString AUDIO("Audio"); + static const QString AUDIO_BUFFERS("Audio Buffers"); { auto getter = []()->bool { return !DependencyManager::get()->getReceivedAudioStream().dynamicJitterBufferEnabled(); }; auto setter = [](bool value) { DependencyManager::get()->getReceivedAudioStream().setDynamicJitterBufferEnabled(!value); }; - auto preference = new CheckPreference(AUDIO, "Disable dynamic jitter buffer", getter, setter); + auto preference = new CheckPreference(AUDIO_BUFFERS, "Disable dynamic jitter buffer", getter, setter); preferences->addPreference(preference); } { auto getter = []()->float { return DependencyManager::get()->getReceivedAudioStream().getStaticJitterBufferFrames(); }; auto setter = [](float value) { DependencyManager::get()->getReceivedAudioStream().setStaticJitterBufferFrames(value); }; - auto preference = new SpinnerPreference(AUDIO, "Static jitter buffer frames", getter, setter); + auto preference = new SpinnerPreference(AUDIO_BUFFERS, "Static jitter buffer frames", getter, setter); preference->setMin(0); preference->setMax(2000); preference->setStep(1); @@ -246,13 +246,13 @@ void setupPreferences() { { auto getter = []()->bool { return !DependencyManager::get()->getOutputStarveDetectionEnabled(); }; auto setter = [](bool value) { DependencyManager::get()->setOutputStarveDetectionEnabled(!value); }; - auto preference = new CheckPreference(AUDIO, "Disable output starve detection", getter, setter); + auto preference = new CheckPreference(AUDIO_BUFFERS, "Disable output starve detection", getter, setter); preferences->addPreference(preference); } { auto getter = []()->float { return DependencyManager::get()->getOutputBufferSize(); }; auto setter = [](float value) { DependencyManager::get()->setOutputBufferSize(value); }; - auto preference = new SpinnerPreference(AUDIO, "Output buffer initial frames", getter, setter); + auto preference = new SpinnerPreference(AUDIO_BUFFERS, "Output buffer initial frames", getter, setter); preference->setMin(AudioClient::MIN_BUFFER_FRAMES); preference->setMax(AudioClient::MAX_BUFFER_FRAMES); preference->setStep(1); @@ -262,13 +262,13 @@ void setupPreferences() { { auto getter = []()->bool { return DependencyManager::get()->isSimulatingJitter(); }; auto setter = [](bool value) { return DependencyManager::get()->setIsSimulatingJitter(value); }; - auto preference = new CheckPreference(AUDIO, "Packet jitter simulator", getter, setter); + auto preference = new CheckPreference(AUDIO_BUFFERS, "Packet jitter simulator", getter, setter); preferences->addPreference(preference); } { auto getter = []()->float { return DependencyManager::get()->getGateThreshold(); }; auto setter = [](float value) { return DependencyManager::get()->setGateThreshold(value); }; - auto preference = new SpinnerPreference(AUDIO, "Packet throttle threshold", getter, setter); + auto preference = new SpinnerPreference(AUDIO_BUFFERS, "Packet throttle threshold", getter, setter); preference->setMin(1); preference->setMax(200); preference->setStep(1);