Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Jeffrey Ventrella 2013-05-21 15:03:06 -07:00
commit 1f82d339d0
2 changed files with 0 additions and 3 deletions

View file

@ -306,8 +306,6 @@ Audio::Audio(Oscilloscope* scope) :
_averagedLatency(0.0),
_measuredJitter(0),
_jitterBufferLengthMsecs(12.0),
_jitterBufferSamples(_jitterBufferLengthMsecs *
NUM_AUDIO_CHANNELS * (SAMPLE_RATE / 1000.0)),
_wasStarved(0),
_lastInputLoudness(0),
_mixerLoopbackFlag(false),

View file

@ -49,7 +49,6 @@ private:
float _averagedLatency;
float _measuredJitter;
float _jitterBufferLengthMsecs;
short _jitterBufferSamples;
int _wasStarved;
float _lastInputLoudness;
bool _mixerLoopbackFlag;