Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 20:06:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Jeffrey Ventrella 2013-05-21 15:27:37 -07:00
commit 16a1dd103d
3 changed files with 36 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
cmake/modules/FindGLM.cmake
View file

@ -29,35 +29,42 @@
# (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.)
# default search dirs IF (GLM_INCLUDE_DIR)
SET(_glm_HEADER_SEARCH_DIRS set(GLM_INCLUDE_DIRS "${GLM_INCLUDE_DIR}")
"/usr/include" SET(GLM_FOUND TRUE)
"/usr/local/include") ELSE (GLM_INCLUDE_DIR)
# default search dirs
SET(_glm_HEADER_SEARCH_DIRS
"/usr/include"
"/usr/local/include")
# check environment variable # check environment variable
SET(_glm_ENV_ROOT_DIR "$ENV{GLM_ROOT_DIR}") SET(_glm_ENV_ROOT_DIR "$ENV{GLM_ROOT_DIR}")
IF(NOT GLM_ROOT_DIR AND _glm_ENV_ROOT_DIR) IF(NOT GLM_ROOT_DIR AND _glm_ENV_ROOT_DIR)
SET(GLM_ROOT_DIR "${_glm_ENV_ROOT_DIR}") SET(GLM_ROOT_DIR "${_glm_ENV_ROOT_DIR}")
ENDIF(NOT GLM_ROOT_DIR AND _glm_ENV_ROOT_DIR) ENDIF(NOT GLM_ROOT_DIR AND _glm_ENV_ROOT_DIR)
# put user specified location at beginning of search # put user specified location at beginning of search
IF(GLM_ROOT_DIR) IF(GLM_ROOT_DIR)
SET(_glm_HEADER_SEARCH_DIRS "${GLM_ROOT_DIR}" SET(_glm_HEADER_SEARCH_DIRS "${GLM_ROOT_DIR}"
"${GLM_ROOT_DIR}/include" "${GLM_ROOT_DIR}/include"
${_glm_HEADER_SEARCH_DIRS}) ${_glm_HEADER_SEARCH_DIRS})
ENDIF(GLM_ROOT_DIR) ENDIF(GLM_ROOT_DIR)
# locate header # locate header
FIND_PATH(GLM_INCLUDE_DIR "glm/glm.hpp" FIND_PATH(GLM_INCLUDE_DIR "glm/glm.hpp"
PATHS ${_glm_HEADER_SEARCH_DIRS}) PATHS ${_glm_HEADER_SEARCH_DIRS})
INCLUDE(FindPackageHandleStandardArgs) INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLM DEFAULT_MSG FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLM DEFAULT_MSG
GLM_INCLUDE_DIR) GLM_INCLUDE_DIR)
IF(GLM_FOUND) IF(GLM_FOUND)
SET(GLM_INCLUDE_DIRS "${GLM_INCLUDE_DIR}") SET(GLM_INCLUDE_DIRS "${GLM_INCLUDE_DIR}")
MESSAGE(STATUS "GLM_INCLUDE_DIR = ${GLM_INCLUDE_DIR}") if (NOT GLM_FIND_QUIETLY)
ENDIF(GLM_FOUND) MESSAGE(STATUS "GLM_INCLUDE_DIR = ${GLM_INCLUDE_DIR}")
endif (NOT GLM_FIND_QUIETLY)
ENDIF(GLM_FOUND)
ENDIF(GLM_INCLUDE_DIR)

2
interface/src/Audio.cpp
View file

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

1
interface/src/Audio.h
View file

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