Merge pull request #372 from birarda/master

refactor FindGLM to not check twice, revert the previous audio change

cmake/modules/FindGLM.cmake

@@ -29,6 +29,10 @@
 # (To distribute this file outside of CMake, substitute the full
 #  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
   SET(_glm_HEADER_SEARCH_DIRS
       "/usr/include"
@@ -59,5 +63,8 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLM DEFAULT_MSG
   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) 

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

interface/src/Audio.h

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