Move ignorePenumbra to positional audio

This commit is contained in:
Atlante45 2014-11-05 16:19:26 +01:00
parent 617bb23206
commit 85a59249df
4 changed files with 5 additions and 8 deletions

View file

@ -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)
{
}

View file

@ -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);

View file

@ -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)
{

View file

@ -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;