From 85a59249df488b9aefa7439a271168559841a969 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Wed, 5 Nov 2014 16:19:26 +0100
Subject: [PATCH] Move ignorePenumbra to positional audio

---
 libraries/audio/src/InboundAudioStream.cpp    | 3 +--
 libraries/audio/src/InboundAudioStream.h      | 6 ------
 libraries/audio/src/PositionalAudioStream.cpp | 1 +
 libraries/audio/src/PositionalAudioStream.h   | 3 +++
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/libraries/audio/src/InboundAudioStream.cpp b/libraries/audio/src/InboundAudioStream.cpp
index 5cb7697de6..366659b633 100644
--- a/libraries/audio/src/InboundAudioStream.cpp
+++ b/libraries/audio/src/InboundAudioStream.cpp
@@ -45,8 +45,7 @@ InboundAudioStream::InboundAudioStream(int numFrameSamples, int numFramesCapacit
     _currentJitterBufferFrames(0),
     _timeGapStatsForStatsPacket(0, STATS_FOR_STATS_PACKET_WINDOW_SECONDS),
     _repetitionWithFade(settings._repetitionWithFade),
-    _hasReverb(false),
-    _ignorePenumbra(false)
+    _hasReverb(false)
 {
 }
 
diff --git a/libraries/audio/src/InboundAudioStream.h b/libraries/audio/src/InboundAudioStream.h
index 94ee9ce43e..a9ebc70072 100644
--- a/libraries/audio/src/InboundAudioStream.h
+++ b/libraries/audio/src/InboundAudioStream.h
@@ -47,7 +47,6 @@ const bool DEFAULT_REPETITION_WITH_FADE = true;
 
 // Audio Env bitset
 const int HAS_REVERB_BIT = 0; // 1st bit
-const int IGNORE_PENUMBRA = 1; // 2nd bit
 
 class InboundAudioStream : public NodeData {
     Q_OBJECT
@@ -162,8 +161,6 @@ public:
     float getWetLevel() const { return _wetLevel; }
     void setReverb(float reverbTime, float wetLevel);
     void clearReverb() { _hasReverb = false; }
-
-    bool ignorePenumbraFilter() { return _ignorePenumbra; }
     
 public slots:
     /// This function should be called every second for all the stats to function properly. If dynamic jitter buffers
@@ -258,9 +255,6 @@ protected:
     bool _hasReverb;
     float _reverbTime;
     float _wetLevel;
-    
-    // Ignore penumbra filter
-    bool _ignorePenumbra;
 };
 
 float calculateRepeatedFrameFadeFactor(int indexOfRepeat);
diff --git a/libraries/audio/src/PositionalAudioStream.cpp b/libraries/audio/src/PositionalAudioStream.cpp
index 6334ac0efb..d61edcb30d 100644
--- a/libraries/audio/src/PositionalAudioStream.cpp
+++ b/libraries/audio/src/PositionalAudioStream.cpp
@@ -29,6 +29,7 @@ PositionalAudioStream::PositionalAudioStream(PositionalAudioStream::Type type, b
     _orientation(0.0f, 0.0f, 0.0f, 0.0f),
     _shouldLoopbackForNode(false),
     _isStereo(isStereo),
+    _ignorePenumbra(false),
     _lastPopOutputTrailingLoudness(0.0f),
     _lastPopOutputLoudness(0.0f)
 {
diff --git a/libraries/audio/src/PositionalAudioStream.h b/libraries/audio/src/PositionalAudioStream.h
index 6ac189352b..c2a16367c4 100644
--- a/libraries/audio/src/PositionalAudioStream.h
+++ b/libraries/audio/src/PositionalAudioStream.h
@@ -39,6 +39,7 @@ public:
 
     bool shouldLoopbackForNode() const { return _shouldLoopbackForNode; }
     bool isStereo() const { return _isStereo; }
+    bool ignorePenumbraFilter() { return _ignorePenumbra; }
     PositionalAudioStream::Type getType() const { return _type; }
     const glm::vec3& getPosition() const { return _position; }
     const glm::quat& getOrientation() const { return _orientation; }
@@ -57,6 +58,8 @@ protected:
 
     bool _shouldLoopbackForNode;
     bool _isStereo;
+    // Ignore penumbra filter
+    bool _ignorePenumbra;
 
     float _lastPopOutputTrailingLoudness;
     float _lastPopOutputLoudness;