mirror of
https://github.com/lubosz/overte.git
synced 2025-08-14 01:13:28 +02:00
Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
16a1dd103d
3 changed files with 36 additions and 26 deletions
|
@ -29,6 +29,10 @@
|
||||||
# (To distribute this file outside of CMake, substitute the full
|
# (To distribute this file outside of CMake, substitute the full
|
||||||
# License text for the above reference.)
|
# License text for the above reference.)
|
||||||
|
|
||||||
|
IF (GLM_INCLUDE_DIR)
|
||||||
|
set(GLM_INCLUDE_DIRS "${GLM_INCLUDE_DIR}")
|
||||||
|
SET(GLM_FOUND TRUE)
|
||||||
|
ELSE (GLM_INCLUDE_DIR)
|
||||||
# default search dirs
|
# default search dirs
|
||||||
SET(_glm_HEADER_SEARCH_DIRS
|
SET(_glm_HEADER_SEARCH_DIRS
|
||||||
"/usr/include"
|
"/usr/include"
|
||||||
|
@ -59,5 +63,8 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLM DEFAULT_MSG
|
||||||
IF(GLM_FOUND)
|
IF(GLM_FOUND)
|
||||||
SET(GLM_INCLUDE_DIRS "${GLM_INCLUDE_DIR}")
|
SET(GLM_INCLUDE_DIRS "${GLM_INCLUDE_DIR}")
|
||||||
|
|
||||||
|
if (NOT GLM_FIND_QUIETLY)
|
||||||
MESSAGE(STATUS "GLM_INCLUDE_DIR = ${GLM_INCLUDE_DIR}")
|
MESSAGE(STATUS "GLM_INCLUDE_DIR = ${GLM_INCLUDE_DIR}")
|
||||||
|
endif (NOT GLM_FIND_QUIETLY)
|
||||||
ENDIF(GLM_FOUND)
|
ENDIF(GLM_FOUND)
|
||||||
|
ENDIF(GLM_INCLUDE_DIR)
|
|
@ -306,6 +306,8 @@ Audio::Audio(Oscilloscope* scope) :
|
||||||
_averagedLatency(0.0),
|
_averagedLatency(0.0),
|
||||||
_measuredJitter(0),
|
_measuredJitter(0),
|
||||||
_jitterBufferLengthMsecs(12.0),
|
_jitterBufferLengthMsecs(12.0),
|
||||||
|
_jitterBufferSamples(_jitterBufferLengthMsecs *
|
||||||
|
NUM_AUDIO_CHANNELS * (SAMPLE_RATE / 1000.0)),
|
||||||
_wasStarved(0),
|
_wasStarved(0),
|
||||||
_lastInputLoudness(0),
|
_lastInputLoudness(0),
|
||||||
_mixerLoopbackFlag(false),
|
_mixerLoopbackFlag(false),
|
||||||
|
|
|
@ -49,6 +49,7 @@ private:
|
||||||
float _averagedLatency;
|
float _averagedLatency;
|
||||||
float _measuredJitter;
|
float _measuredJitter;
|
||||||
float _jitterBufferLengthMsecs;
|
float _jitterBufferLengthMsecs;
|
||||||
|
short _jitterBufferSamples;
|
||||||
int _wasStarved;
|
int _wasStarved;
|
||||||
float _lastInputLoudness;
|
float _lastInputLoudness;
|
||||||
bool _mixerLoopbackFlag;
|
bool _mixerLoopbackFlag;
|
||||||
|
|
Loading…
Reference in a new issue