Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-09 04:48:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix AudioBuffers to work in tablet

Browse source
This commit is contained in:
Zach Pomerantz 2017-06-05 15:03:26 -04:00
parent 9395de1873
commit 7cb38d22c3
4 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/resources/qml/hifi/dialogs/AudioBuffers.qml
View file

@ -5,9 +5,9 @@ import "../../dialogs"
PreferencesDialog { PreferencesDialog {
id: root id: root
objectName: "AudioPreferencesDialog" objectName: "AudioBuffersDialog"
title: "Audio Settings" title: "Audio Settings"
showCategories: ["Audio"] showCategories: ["Audio Buffers"]
property var settings: Settings { property var settings: Settings {
category: root.objectName category: root.objectName
property alias x: root.x property alias x: root.x

12
interface/resources/qml/hifi/tablet/TabletAudioPreferences.qml → interface/resources/qml/hifi/tablet/TabletAudioBuffers.qml
View file

@ -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. // Copyright 2017 High Fidelity, Inc.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
@ -17,8 +17,8 @@ StackView {
id: profileRoot id: profileRoot
initialItem: root initialItem: root
objectName: "stack" objectName: "stack"
property string title: "Audio Settings" property string title: "Audio Buffers"
property alias gotoPreviousApp: root.gotoPreviousApp;
property var eventBridge; property var eventBridge;
signal sendToScript(var message); signal sendToScript(var message);
@ -32,7 +32,7 @@ StackView {
TabletPreferencesDialog { TabletPreferencesDialog {
id: root id: root
objectName: "TabletAudioPreferences" objectName: "TabletAudioBuffersDialog"
showCategories: ["Audio"] showCategories: ["Audio Buffers"]
} }
} }

2
interface/src/Menu.cpp
View file

@ -615,7 +615,7 @@ Menu::Menu() {
action = addActionToQMenuAndActionHash(audioDebugMenu, "Buffers..."); action = addActionToQMenuAndActionHash(audioDebugMenu, "Buffers...");
connect(action, &QAction::triggered, [] { connect(action, &QAction::triggered, [] {
qApp->showDialog(QString("hifi/dialogs/AudioBuffers.qml"), qApp->showDialog(QString("hifi/dialogs/AudioBuffers.qml"),
QString("../../hifi/dialogs/AudioBuffers.qml"), "AudioPreferencesDialog"); QString("../../hifi/tablet/TabletAudioBuffers.qml"), "AudioBuffersDialog");
}); });
auto audioIO = DependencyManager::get<AudioClient>(); auto audioIO = DependencyManager::get<AudioClient>();

14
interface/src/ui/PreferencesDialog.cpp
View file

@ -227,17 +227,17 @@ void setupPreferences() {
preferences->addPreference(preference); preferences->addPreference(preference);
} }
static const QString AUDIO("Audio"); static const QString AUDIO_BUFFERS("Audio Buffers");
{ {
auto getter = []()->bool { return !DependencyManager::get<AudioClient>()->getReceivedAudioStream().dynamicJitterBufferEnabled(); }; auto getter = []()->bool { return !DependencyManager::get<AudioClient>()->getReceivedAudioStream().dynamicJitterBufferEnabled(); };
auto setter = [](bool value) { DependencyManager::get<AudioClient>()->getReceivedAudioStream().setDynamicJitterBufferEnabled(!value); }; auto setter = [](bool value) { DependencyManager::get<AudioClient>()->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); preferences->addPreference(preference);
} }
{ {
auto getter = []()->float { return DependencyManager::get<AudioClient>()->getReceivedAudioStream().getStaticJitterBufferFrames(); }; auto getter = []()->float { return DependencyManager::get<AudioClient>()->getReceivedAudioStream().getStaticJitterBufferFrames(); };
auto setter = [](float value) { DependencyManager::get<AudioClient>()->getReceivedAudioStream().setStaticJitterBufferFrames(value); }; auto setter = [](float value) { DependencyManager::get<AudioClient>()->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->setMin(0);
preference->setMax(2000); preference->setMax(2000);
preference->setStep(1); preference->setStep(1);
@ -246,13 +246,13 @@ void setupPreferences() {
{ {
auto getter = []()->bool { return !DependencyManager::get<AudioClient>()->getOutputStarveDetectionEnabled(); }; auto getter = []()->bool { return !DependencyManager::get<AudioClient>()->getOutputStarveDetectionEnabled(); };
auto setter = [](bool value) { DependencyManager::get<AudioClient>()->setOutputStarveDetectionEnabled(!value); }; auto setter = [](bool value) { DependencyManager::get<AudioClient>()->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); preferences->addPreference(preference);
} }
{ {
auto getter = []()->float { return DependencyManager::get<AudioClient>()->getOutputBufferSize(); }; auto getter = []()->float { return DependencyManager::get<AudioClient>()->getOutputBufferSize(); };
auto setter = [](float value) { DependencyManager::get<AudioClient>()->setOutputBufferSize(value); }; auto setter = [](float value) { DependencyManager::get<AudioClient>()->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->setMin(AudioClient::MIN_BUFFER_FRAMES);
preference->setMax(AudioClient::MAX_BUFFER_FRAMES); preference->setMax(AudioClient::MAX_BUFFER_FRAMES);
preference->setStep(1); preference->setStep(1);
@ -262,13 +262,13 @@ void setupPreferences() {
{ {
auto getter = []()->bool { return DependencyManager::get<AudioClient>()->isSimulatingJitter(); }; auto getter = []()->bool { return DependencyManager::get<AudioClient>()->isSimulatingJitter(); };
auto setter = [](bool value) { return DependencyManager::get<AudioClient>()->setIsSimulatingJitter(value); }; auto setter = [](bool value) { return DependencyManager::get<AudioClient>()->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); preferences->addPreference(preference);
} }
{ {
auto getter = []()->float { return DependencyManager::get<AudioClient>()->getGateThreshold(); }; auto getter = []()->float { return DependencyManager::get<AudioClient>()->getGateThreshold(); };
auto setter = [](float value) { return DependencyManager::get<AudioClient>()->setGateThreshold(value); }; auto setter = [](float value) { return DependencyManager::get<AudioClient>()->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->setMin(1);
preference->setMax(200); preference->setMax(200);
preference->setStep(1); preference->setStep(1);