From 95cef67e3324afe6046ec5e83d522b7e7e17a03d Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Tue, 21 May 2013 15:01:08 -0700 Subject: [PATCH 1/2] Revert "remove unused variable in Audio" This reverts commit bbdd601855c4ce380389c3154954d51ce64e4872. --- interface/src/Audio.cpp | 2 ++ interface/src/Audio.h | 1 + 2 files changed, 3 insertions(+) diff --git a/interface/src/Audio.cpp b/interface/src/Audio.cpp index 6488a2c9bd..596751ac27 100644 --- a/interface/src/Audio.cpp +++ b/interface/src/Audio.cpp @@ -306,6 +306,8 @@ 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), diff --git a/interface/src/Audio.h b/interface/src/Audio.h index 7a842d3d70..34a342a1d4 100644 --- a/interface/src/Audio.h +++ b/interface/src/Audio.h @@ -49,6 +49,7 @@ private: float _averagedLatency; float _measuredJitter; float _jitterBufferLengthMsecs; + short _jitterBufferSamples; int _wasStarved; float _lastInputLoudness; bool _mixerLoopbackFlag; From a4bf95f93b81a2bf17c2d2fd8eb724978ee309b1 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Tue, 21 May 2013 15:01:41 -0700 Subject: [PATCH 2/2] don't go looking for GLM twice, check the cache --- cmake/modules/FindGLM.cmake | 59 +++++++++++++++++++++---------------- 1 file changed, 33 insertions(+), 26 deletions(-) diff --git a/cmake/modules/FindGLM.cmake b/cmake/modules/FindGLM.cmake index 2d9009298f..764e62f9c2 100644 --- a/cmake/modules/FindGLM.cmake +++ b/cmake/modules/FindGLM.cmake @@ -29,35 +29,42 @@ # (To distribute this file outside of CMake, substitute the full # License text for the above reference.) -# default search dirs -SET(_glm_HEADER_SEARCH_DIRS - "/usr/include" - "/usr/local/include") +IF (GLM_INCLUDE_DIR) + set(GLM_INCLUDE_DIRS "${GLM_INCLUDE_DIR}") + SET(GLM_FOUND TRUE) +ELSE (GLM_INCLUDE_DIR) + # default search dirs + SET(_glm_HEADER_SEARCH_DIRS + "/usr/include" + "/usr/local/include") -# check environment variable -SET(_glm_ENV_ROOT_DIR "$ENV{GLM_ROOT_DIR}") + # check environment variable + SET(_glm_ENV_ROOT_DIR "$ENV{GLM_ROOT_DIR}") -IF(NOT GLM_ROOT_DIR AND _glm_ENV_ROOT_DIR) - SET(GLM_ROOT_DIR "${_glm_ENV_ROOT_DIR}") -ENDIF(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}") + ENDIF(NOT GLM_ROOT_DIR AND _glm_ENV_ROOT_DIR) -# put user specified location at beginning of search -IF(GLM_ROOT_DIR) - SET(_glm_HEADER_SEARCH_DIRS "${GLM_ROOT_DIR}" - "${GLM_ROOT_DIR}/include" - ${_glm_HEADER_SEARCH_DIRS}) -ENDIF(GLM_ROOT_DIR) + # put user specified location at beginning of search + IF(GLM_ROOT_DIR) + SET(_glm_HEADER_SEARCH_DIRS "${GLM_ROOT_DIR}" + "${GLM_ROOT_DIR}/include" + ${_glm_HEADER_SEARCH_DIRS}) + ENDIF(GLM_ROOT_DIR) -# locate header -FIND_PATH(GLM_INCLUDE_DIR "glm/glm.hpp" - PATHS ${_glm_HEADER_SEARCH_DIRS}) + # locate header + FIND_PATH(GLM_INCLUDE_DIR "glm/glm.hpp" + PATHS ${_glm_HEADER_SEARCH_DIRS}) -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLM DEFAULT_MSG - GLM_INCLUDE_DIR) + INCLUDE(FindPackageHandleStandardArgs) + FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLM DEFAULT_MSG + GLM_INCLUDE_DIR) -IF(GLM_FOUND) - SET(GLM_INCLUDE_DIRS "${GLM_INCLUDE_DIR}") - - MESSAGE(STATUS "GLM_INCLUDE_DIR = ${GLM_INCLUDE_DIR}") -ENDIF(GLM_FOUND) + IF(GLM_FOUND) + SET(GLM_INCLUDE_DIRS "${GLM_INCLUDE_DIR}") + + if (NOT GLM_FIND_QUIETLY) + MESSAGE(STATUS "GLM_INCLUDE_DIR = ${GLM_INCLUDE_DIR}") + endif (NOT GLM_FIND_QUIETLY) + ENDIF(GLM_FOUND) +ENDIF(GLM_INCLUDE_DIR) \ No newline at end of file