From 94edf2c900f88569d348662f982d685703522ff3 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Wed, 24 Sep 2014 15:45:43 -0700 Subject: [PATCH 1/2] Defaulted penumbra filter to true --- assignment-client/src/audio/AudioMixer.cpp | 4 ++-- domain-server/resources/web/settings/describe.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp index a8a7ace06f..a5d9a48d0c 100644 --- a/assignment-client/src/audio/AudioMixer.cpp +++ b/assignment-client/src/audio/AudioMixer.cpp @@ -75,7 +75,7 @@ InboundAudioStream::Settings AudioMixer::_streamSettings; bool AudioMixer::_printStreamStats = false; -bool AudioMixer::_enableFilter = false; +bool AudioMixer::_enableFilter = true; AudioMixer::AudioMixer(const QByteArray& packet) : ThreadedAssignment(packet), @@ -710,7 +710,7 @@ void AudioMixer::run() { } const QString FILTER_KEY = "J-enable-filter"; - _enableFilter = audioGroupObject[FILTER_KEY].toBool(); + _enableFilter = audioGroupObject[FILTER_KEY].toBool(_enableFilter); if (_enableFilter) { qDebug() << "Filter enabled"; } diff --git a/domain-server/resources/web/settings/describe.json b/domain-server/resources/web/settings/describe.json index fee7ff21fc..2ea0aec0c7 100644 --- a/domain-server/resources/web/settings/describe.json +++ b/domain-server/resources/web/settings/describe.json @@ -67,7 +67,7 @@ "type": "checkbox", "label": "Enable Positional Filter", "help": "If enabled, positional audio stream uses lowpass filter", - "default": false + "default": true } } } From fee01f2c73d56ec98f65a8e9b24926642cc48b43 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Thu, 25 Sep 2014 15:26:13 -0700 Subject: [PATCH 2/2] Fixed unknow function --- assignment-client/src/audio/AudioMixer.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp index a5d9a48d0c..bbd1fe4c07 100644 --- a/assignment-client/src/audio/AudioMixer.cpp +++ b/assignment-client/src/audio/AudioMixer.cpp @@ -710,7 +710,9 @@ void AudioMixer::run() { } const QString FILTER_KEY = "J-enable-filter"; - _enableFilter = audioGroupObject[FILTER_KEY].toBool(_enableFilter); + if (audioGroupObject[FILTER_KEY].isBool()) { + _enableFilter = audioGroupObject[FILTER_KEY].toBool(); + } if (_enableFilter) { qDebug() << "Filter enabled"; }