From c30ef9c331e0e0587d7c62f1334a93af98773970 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Wed, 17 Sep 2014 08:52:23 -0700 Subject: [PATCH] Revert "flip default for enable filter to be disable filter to work around settings bug" This reverts commit 2a9d8d923831d733975b02c5dcaf3ce644c86aa1. --- assignment-client/src/audio/AudioMixer.cpp | 6 ++---- domain-server/resources/web/settings/describe.json | 12 ++++++------ 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp index 0477dfed84..c872906d63 100644 --- a/assignment-client/src/audio/AudioMixer.cpp +++ b/assignment-client/src/audio/AudioMixer.cpp @@ -690,12 +690,10 @@ void AudioMixer::run() { qDebug() << "Stream stats will be printed to stdout"; } - const QString FILTER_KEY = "J-disable-filter"; - _enableFilter = !audioGroupObject[FILTER_KEY].toBool(); + const QString FILTER_KEY = "J-enable-filter"; + _enableFilter = audioGroupObject[FILTER_KEY].toBool(); if (_enableFilter) { qDebug() << "Filter enabled"; - } else { - qDebug() << "Filter disabled"; } const QString UNATTENUATED_ZONE_KEY = "Z-unattenuated-zone"; diff --git a/domain-server/resources/web/settings/describe.json b/domain-server/resources/web/settings/describe.json index c68d42d3e8..2ea0aec0c7 100644 --- a/domain-server/resources/web/settings/describe.json +++ b/domain-server/resources/web/settings/describe.json @@ -57,17 +57,17 @@ "help": "If enabled, audio upstream and downstream stats of each agent will be printed each second to stdout", "default": false }, - "J-disable-filter": { - "type": "checkbox", - "label": "Disable Positional Filter", - "help": "If checked the positional audio stream will not use a lowpass filter", - "default": false - }, "Z-unattenuated-zone": { "label": "Unattenuated Zone", "help": "Boxes for source and listener (corner x, corner y, corner z, size x, size y, size z, corner x, corner y, corner z, size x, size y, size z)", "placeholder": "no zone", "default": "" + }, + "J-enable-filter": { + "type": "checkbox", + "label": "Enable Positional Filter", + "help": "If enabled, positional audio stream uses lowpass filter", + "default": true } } }