Merge branch 'openframeworks:master' into squared

artificiel · web-flow · commit a6444a1e3392 · 2024-11-07T18:16:02.000-05:00
diff --git a/apps/projectGenerator b/apps/projectGenerator
@@ -1 +1 @@
-Subproject commit 51f2ad14aad8031ca1e0001791089d0742fa1699
+Subproject commit a742c1fdb869983f7a6a813e69514aea62e89af5
diff --git a/examples/sound/soundBufferExample/src/ofApp.cpp b/examples/sound/soundBufferExample/src/ofApp.cpp
@@ -24,7 +24,7 @@ void ofApp::update(){
 	// "lastBuffer" is shared between update() and audioOut(), which are called
 	// on two different threads. This lock makes sure we don't use lastBuffer
 	// from both threads simultaneously (see the corresponding lock in audioOut())
-	unique_lock<mutex> lock(audioMutex);
+	std::unique_lock<std::mutex> lock(audioMutex);
 
 	// this loop is building up a polyline representing the audio contained in
 	// the left channel of the buffer
@@ -92,7 +92,7 @@ void ofApp::audioOut(ofSoundBuffer &outBuffer) {
 		pulsePhase += pulsePhaseStep;
 	}
 	
-	unique_lock<mutex> lock(audioMutex);
+	std::unique_lock<std::mutex> lock(audioMutex);
 	lastBuffer = outBuffer;
 }
 
diff --git a/libs/openFrameworks/3d/of3dUtils.cpp b/libs/openFrameworks/3d/of3dUtils.cpp
@@ -2,6 +2,10 @@
 #include "ofAppRunner.h"
 #include "ofGraphicsBaseTypes.h"
 
+#define GLM_FORCE_CTOR_INIT
+#define GLM_ENABLE_EXPERIMENTAL
+#include <glm/vec3.hpp>
+
 //--------------------------------------------------------------
 void ofDrawAxis(float size) {
 	ofGetCurrentRenderer()->drawAxis(size);
diff --git a/libs/openFrameworks/3d/of3dUtils.h b/libs/openFrameworks/3d/of3dUtils.h
@@ -1,8 +1,9 @@
 #pragma once
 
-#define GLM_FORCE_CTOR_INIT
-#define GLM_ENABLE_EXPERIMENTAL
-#include <glm/vec3.hpp>
+#include <glm/detail/qualifier.hpp>
+namespace glm {
+	typedef vec<3, float, defaultp>		vec3;
+}
 
 /// \brief Draws x,y,z axes representing the current reference frame.
 ///
diff --git a/libs/openFrameworks/3d/ofMesh.inl b/libs/openFrameworks/3d/ofMesh.inl
@@ -1657,7 +1657,7 @@ const std::vector<ofMeshFace_<V,N,C,T>> & ofMesh_<V,N,C,T>::getUniqueFaces() con
 		bool bHasTexcoords  = hasTexCoords();
 
 		if( getMode() == OF_PRIMITIVE_TRIANGLES) {
-			for(std::size_t j = 0; j < indices.size(); j += 3) {
+			for(ofIndexType j = 0; j < indices.size(); j += 3) {
 				ofMeshFace_<V,N,C,T> & tri = faces[triindex];
 				for(std::size_t k = 0; k < 3; k++) {
 					index = indices[j+k];
diff --git a/libs/openFrameworks/3d/ofNode.cpp b/libs/openFrameworks/3d/ofNode.cpp
@@ -2,6 +2,10 @@
 #include "ofNode.h"
 #include "of3dGraphics.h"
 
+#define GLM_FORCE_CTOR_INIT
+#define GLM_ENABLE_EXPERIMENTAL
+#include <glm/mat4x4.hpp>
+
 //----------------------------------------
 ofNode::ofNode()
 :parent(nullptr)
diff --git a/libs/openFrameworks/3d/ofNode.h b/libs/openFrameworks/3d/ofNode.h
@@ -5,7 +5,6 @@
 
 #define GLM_FORCE_CTOR_INIT
 #define GLM_ENABLE_EXPERIMENTAL
-#include <glm/mat4x4.hpp>
 #include <glm/gtc/quaternion.hpp>
 
 #include <array>
diff --git a/libs/openFrameworks/app/ofAppEGLWindow.cpp b/libs/openFrameworks/app/ofAppEGLWindow.cpp
@@ -6,7 +6,7 @@
 #include "ofFileUtils.h"
 #include "ofGLProgrammableRenderer.h"
 #include "ofGLRenderer.h"
-#include "ofVectorMath.h"
+// #include "ofVectorMath.h"
 #include <assert.h>
 // x11
 #include <X11/Xutil.h>
diff --git a/libs/openFrameworks/gl/ofShader.h b/libs/openFrameworks/gl/ofShader.h
@@ -10,9 +10,16 @@
 // MARK: ofConstants Targets
 #include "ofConstants.h"
 
-#define GLM_FORCE_CTOR_INIT
-#define GLM_ENABLE_EXPERIMENTAL
-#include <glm/fwd.hpp>
+#include <glm/detail/qualifier.hpp>
+namespace glm {
+	typedef vec<2, float, defaultp>		vec2;
+	typedef vec<3, float, defaultp>		vec3;
+	typedef vec<4, float, defaultp>		vec4;
+
+	typedef float					f32;
+	typedef mat<3, 3, f32, defaultp>	mat3;
+	typedef mat<4, 4, f32, defaultp>	mat4;
+}
 
 #include <unordered_map>
 
diff --git a/libs/openFrameworks/graphics/ofGraphics.h b/libs/openFrameworks/graphics/ofGraphics.h
@@ -3,9 +3,11 @@
 #include "ofConstants.h"
 #include "ofGraphicsBaseTypes.h"
 
-#define GLM_FORCE_CTOR_INIT
-#define GLM_ENABLE_EXPERIMENTAL
-#include <glm/fwd.hpp>
+#include <glm/detail/qualifier.hpp>
+namespace glm {
+	typedef vec<2, float, defaultp>		vec2;
+	typedef vec<3, float, defaultp>		vec3;
+}
 
 class ofVec3f;
 class ofVec2f;
diff --git a/libs/openFrameworks/graphics/ofGraphicsBaseTypes.h b/libs/openFrameworks/graphics/ofGraphicsBaseTypes.h
@@ -45,10 +45,14 @@ enum ofLoopType : short;
 enum ofOrientation : short;
 
 struct ofBoundingBox{
-    glm::vec3 min = glm::vec3(0,0,0);
-    glm::vec3 max = glm::vec3(0,0,0);
+	glm::vec3 min { 0, 0, 0 };
+	glm::vec3 max { 0, 0, 0 };
 };
 
+#define GLM_FORCE_CTOR_INIT
+#define GLM_ENABLE_EXPERIMENTAL
+#include <glm/mat4x4.hpp>
+
 /// \brief Contains general information about the style of ofGraphics
 /// elements such as color, line width and others.
 class ofStyle {
@@ -198,6 +202,11 @@ class ofBaseDraws {
 	///
 	/// \return the width.
 	virtual float getWidth() const = 0;
+	
+	// TODO: Implement correctly for texture, videos, etc.
+	virtual glm::vec2 getSize() {
+		return { getWidth(), getHeight() };
+	}
 
 	/// \brief Set the anchor point the item is drawn around as a percentage.
 	///
diff --git a/libs/openFrameworks/graphics/ofPolyline.h b/libs/openFrameworks/graphics/ofPolyline.h
@@ -3,9 +3,11 @@
 #ifndef OF_POLYLINE_H
 #define OF_POLYLINE_H
 
-#define GLM_FORCE_CTOR_INIT
-#define GLM_ENABLE_EXPERIMENTAL
-#include <glm/fwd.hpp>
+#include <glm/detail/qualifier.hpp>
+namespace glm {
+	typedef vec<2, float, defaultp>		vec2;
+	typedef vec<3, float, defaultp>		vec3;
+}
 
 #include <deque>
 #include <vector>
diff --git a/libs/openFrameworks/math/ofMath.h b/libs/openFrameworks/math/ofMath.h
@@ -1,13 +1,16 @@
 #pragma once
 
-#define GLM_FORCE_CTOR_INIT
-#define GLM_ENABLE_EXPERIMENTAL
-#include <glm/fwd.hpp>
 #include <glm/gtc/constants.hpp>
+#include <glm/detail/qualifier.hpp>
+namespace glm {
+	typedef vec<2, float, defaultp>		vec2;
+	typedef vec<3, float, defaultp>		vec3;
+	typedef vec<4, float, defaultp>		vec4;
+}
 
 #include <cstdlib>
-#include <cmath>
 #include <algorithm>
+#include <cmath> //std::cos
 
 /// \file
 /// ofMath provides a collection of mathematical utilities and functions.
diff --git a/libs/openFrameworks/math/ofMathConstants.h b/libs/openFrameworks/math/ofMathConstants.h
@@ -11,9 +11,12 @@ using ofDefaultVec2 = ofVec2f;
 using ofDefaultVec3 = ofVec3f;
 using ofDefaultVec4 = ofVec4f;
 #else
-#define GLM_FORCE_CTOR_INIT
-#define GLM_ENABLE_EXPERIMENTAL
-#include <glm/fwd.hpp>
+#include <glm/detail/qualifier.hpp>
+namespace glm {
+	typedef vec<2, float, defaultp>		vec2;
+	typedef vec<3, float, defaultp>		vec3;
+	typedef vec<4, float, defaultp>		vec4;
+}
 using ofDefaultVec2 = glm::vec2;
 using ofDefaultVec3 = glm::vec3;
 using ofDefaultVec4 = glm::vec4;
diff --git a/libs/openFrameworks/math/ofVec4f.h b/libs/openFrameworks/math/ofVec4f.h
@@ -1,11 +1,14 @@
 #pragma once
 
-#define GLM_FORCE_CTOR_INIT
-#define GLM_ENABLE_EXPERIMENTAL
+#include <glm/detail/qualifier.hpp>
+namespace glm {
+	typedef vec<2, float, defaultp>		vec2;
+	typedef vec<3, float, defaultp>		vec3;
+}
+
 #include <glm/vec4.hpp>
-#include <glm/fwd.hpp>
 #include <iostream>
-#include <cmath>
+#include <cmath> // std::sqrt
 
 class ofVec2f;
 class ofVec3f;
diff --git a/libs/openFrameworks/types/ofColor.cpp b/libs/openFrameworks/types/ofColor.cpp
@@ -1,4 +1,6 @@
 #include "ofColor.h"
+#include <limits>
+
 
 template<typename PixelType> const ofColor_<PixelType> ofColor_<PixelType>::gray(limit() / 2, limit() / 2, limit() / 2);
 template<typename PixelType> const ofColor_<PixelType> ofColor_<PixelType>::white(limit(), limit(), limit());
diff --git a/libs/openFrameworks/types/ofColor.h b/libs/openFrameworks/types/ofColor.h
@@ -2,9 +2,9 @@
 
 #define GLM_FORCE_CTOR_INIT
 #define GLM_ENABLE_EXPERIMENTAL
-#include <glm/gtx/wrap.hpp>
+#include <glm/ext/scalar_common.hpp>
+#include <glm/vec3.hpp>
 #include <iostream>
-#include <limits>
 
 /// \class ofColor_
 ///
@@ -684,6 +684,7 @@ void ofColor_<PixelType>::copyFrom(const ofColor_<SrcType> & mom){
 	if(typeid(SrcType) == typeid(float) || typeid(SrcType) == typeid(double)) {
 		// coming from float we need a special case to clamp the values
 		for(int i = 0; i < 4; i++){
+			// FIXME: replace by std::clamp when it is exclusive C++17
 			v[i] = glm::clamp(float(mom[i]), 0.f, 1.f) * factor;
 		}
 	} else{
diff --git a/libs/openFrameworks/types/ofRectangle.cpp b/libs/openFrameworks/types/ofRectangle.cpp
@@ -286,7 +286,7 @@ void ofRectangle::scaleTo(const ofRectangle& targetRect,
 
     if(aspectRatioMode == OF_ASPECT_RATIO_KEEP_BY_EXPANDING ||
        aspectRatioMode == OF_ASPECT_RATIO_KEEP) {
-        if(std::abs(sw) >= std::numeric_limits<float>::epsilon() || std::abs(sh) >= FLT_EPSILON) {
+        if(std::abs(sw) >= std::numeric_limits<float>::epsilon() || std::abs(sh) >= std::numeric_limits<float>::epsilon()) {
             float wRatio = std::abs(tw) / std::abs(sw);
             float hRatio = std::abs(th) / std::abs(sh);
             if(aspectRatioMode == OF_ASPECT_RATIO_KEEP_BY_EXPANDING) {
diff --git a/libs/openFrameworks/video/ofAVFoundationGrabber.mm b/libs/openFrameworks/video/ofAVFoundationGrabber.mm
@@ -3,7 +3,7 @@
  */
 
 #include "ofAVFoundationGrabber.h"
-#include "ofVectorMath.h"
+//#include "ofVectorMath.h"
 #include "ofRectangle.h"
 #include "ofGLUtils.h"
 #include <TargetConditionals.h>
diff --git a/libs/openFrameworks/video/ofAVFoundationPlayer.h b/libs/openFrameworks/video/ofAVFoundationPlayer.h
@@ -27,8 +27,8 @@ class ofAVFoundationPlayer : public ofBaseVideoPlayer {
 	ofAVFoundationPlayer();
 	~ofAVFoundationPlayer();
 	
-	bool load(const of::filesystem::path & fileName) override;
-	void loadAsync(const of::filesystem::path & fileName) override;
+	bool load(const of::filesystem::path & fileName);
+	void loadAsync(const of::filesystem::path & fileName);
 	void close();
 	void update();
 
diff --git a/libs/openFrameworksCompiled/project/ios/CoreOF.xcconfig b/libs/openFrameworksCompiled/project/ios/CoreOF.xcconfig
@@ -10,7 +10,7 @@ HEADER_OF = "$(OF_PATH)/libs/openFrameworks/**"
 HEADER_OFXIOS = "$(OF_PATH)/addons/ofxiOS/**"
 HEADER_FREETYPE = "$(OF_PATH)/libs/freetype/include"
 HEADER_FREETYPE2 = "$(OF_PATH)/libs/freetype/include/freetype"
-HEADER_FMOD = "$(OF_PATH)/libs/fmod/include"
+//HEADER_FMOD = "$(OF_PATH)/libs/fmod/include"
 HEADER_GLEW = "$(OF_PATH)/libs/glew/include"
 HEADER_FREEIMAGE = "$(OF_PATH)/libs/FreeImage/include"
 HEADER_TESS2 = "$(OF_PATH)/libs/tess2/include"
@@ -39,7 +39,7 @@ MISC_FLAGS = "-ObjC"
 
 OF_CORE_LIBS = $(MISC_FLAGS) $(LIB_OF)
 
-OF_CORE_HEADERS = $(HEADER_OF) $(HEADER_OFXIOS) $(HEADER_UTF8) $(HEADER_FREETYPE) $(HEADER_FREETYPE2) $(HEADER_FMOD) $(HEADER_GLEW) $(HEADER_FREEIMAGE) $(HEADER_TESS2) $(HEADER_RTAUDIO) $(HEADER_JSON) $(HEADER_GLM) $(HEADER_FMT) $(HEADER_CURL) $(HEADER_URIPARSER) $(HEADER_PUGIXML)
+OF_CORE_HEADERS = $(HEADER_OF) $(HEADER_OFXIOS) $(HEADER_UTF8) $(HEADER_FREETYPE) $(HEADER_FREETYPE2) $(HEADER_GLEW) $(HEADER_FREEIMAGE) $(HEADER_TESS2) $(HEADER_RTAUDIO) $(HEADER_JSON) $(HEADER_GLM) $(HEADER_FMT) $(HEADER_CURL) $(HEADER_URIPARSER) $(HEADER_PUGIXML)
 
 OF_CORE_FRAMEWORKS = -framework AudioToolbox -framework Accelerate -framework AVFoundation -framework CoreAudio -framework CoreGraphics -framework CoreLocation -framework CoreMotion -framework CoreMedia -framework CoreVideo -framework Foundation -framework GameController -framework GLKit -framework MapKit -framework OpenAL -framework OpenGLES -framework UIKit -framework Security -framework QuartzCore -framework CoreHaptics -framework Metal
 
diff --git a/libs/openFrameworksCompiled/project/macos/config.macos.default.mk b/libs/openFrameworksCompiled/project/macos/config.macos.default.mk
@@ -270,11 +270,11 @@ PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/openFrameworks/app/ofAppEGLWindow.cp
 PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/boost/%
 
 
-ifeq ($(USE_FMOD),0)
-	PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/fmod/%
-	PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/openFrameworks/sound/ofFmodSoundPlayer.cpp
-	PLATFORM_CFLAGS += -DUSE_FMOD=0
-endif
+# ifeq ($(USE_FMOD),0)
+PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/fmod/%
+PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/openFrameworks/sound/ofFmodSoundPlayer.cpp
+PLATFORM_CFLAGS += -DUSE_FMOD=0
+# endif
 
 ##########################################################################################
 # PLATFORM HEADER SEARCH PATHS
@@ -431,10 +431,11 @@ afterplatform: $(TARGET_NAME)
 	@echo TARGET=$(TARGET)
 	@mv $(TARGET) bin/$(BIN_NAME).app/Contents/MacOS
 
-ifneq ($(USE_FMOD),0)
-	@mkdir -p bin/$(BIN_NAME).app/Contents/Frameworks
-	@cp $(OF_LIBS_PATH)/*/lib/$(PLATFORM_LIB_SUBPATH)/*.$(SHARED_LIB_EXTENSION) bin/$(BIN_NAME).app/Contents/Frameworks/;
-endif
+# ifneq ($(USE_FMOD),0)
+# 	@mkdir -p bin/$(BIN_NAME).app/Contents/Frameworks
+# 	@cp $(OF_LIBS_PATH)/*/lib/$(PLATFORM_LIB_SUBPATH)/*.$(SHARED_LIB_EXTENSION) bin/$(BIN_NAME).app/Contents/Frameworks/;
+# endif
+
 
 	@echo
 	@echo "     compiling done"
diff --git a/libs/openFrameworksCompiled/project/makefileCommon/config.addons.mk b/libs/openFrameworksCompiled/project/makefileCommon/config.addons.mk
@@ -108,6 +108,7 @@ define parse_addon
 	$(eval ADDON_PKG_CONFIG_LIBRARIES= ) \
 	$(eval ADDON_FRAMEWORKS= ) \
 	$(eval ADDON_LIBS_EXCLUDE= ) \
+	$(eval ADDON_DEFINES= ) \
 	$(eval ADDON_SOURCES_EXCLUDE= ) \
 	$(call parse_addons_includes, $(addon)) \
 	$(eval ADDON_INCLUDES=$(PARSED_ADDONS_INCLUDES)) \
@@ -159,6 +160,7 @@ define parse_addon
 	$(eval TMP_PROJECT_ADDONS_LDFLAGS += $(ADDON_LDFLAGS)) \
 	$(eval TMP_PROJECT_ADDONS_PKG_CONFIG_LIBRARIES += $(ADDON_PKG_CONFIG_LIBRARIES)) \
 	$(eval TMP_PROJECT_ADDONS_FRAMEWORKS += $(ADDON_FRAMEWORKS)) \
+	$(eval TMP_PROJECT_ADDONS_DEFINES += $(ADDON_DEFINES)) \
 	$(eval PROJECT_AFTER += $(ADDON_AFTER)) \
 	$(if $(strip $(ADDON_SOURCES)), \
 		$(info ADDON_SOURCES_EXCLUDE: $(ADDON_SOURCES_EXCLUDE)) \
@@ -227,7 +229,7 @@ define parse_addon
 			$(eval PROJECT_ADDONS += $(addon_dep)) \
 			$(call parse_addon,$(addon_dep)) \
 		) \
-	)
+	)	
 endef
 
 
@@ -254,6 +256,7 @@ PROJECT_ADDONS_FRAMEWORKS = $(call uniq,$(TMP_PROJECT_ADDONS_FRAMEWORKS))
 PROJECT_ADDONS_SOURCE_FILES = $(call uniq,$(TMP_PROJECT_ADDONS_SOURCE_FILES))
 PROJECT_ADDONS_OBJ_FILES = $(call uniq,$(TMP_PROJECT_ADDONS_OBJ_FILES))
 PROJECT_ADDONS_DATA = $(call uniq,$(TMP_PROJECT_ADDONS_DATA))
+PROJECT_ADDONS_DEFINES = $(call uniq,$(TMP_PROJECT_ADDONS_DEFINES))
 VPATH += $(call uniq, $(ADDON_PATHS))
 
 
diff --git a/libs/openFrameworksCompiled/project/osx/config.osx.default.mk b/libs/openFrameworksCompiled/project/osx/config.osx.default.mk
@@ -270,11 +270,11 @@ PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/openFrameworks/app/ofAppEGLWindow.cp
 PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/boost/%
 
 
-ifeq ($(USE_FMOD),0)
-	PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/fmod/%
-	PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/openFrameworks/sound/ofFmodSoundPlayer.cpp
-	PLATFORM_CFLAGS += -DUSE_FMOD=0
-endif
+# ifeq ($(USE_FMOD),0)
+PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/fmod/%
+PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/openFrameworks/sound/ofFmodSoundPlayer.cpp
+PLATFORM_CFLAGS += -DUSE_FMOD=0
+# endif
 
 ##########################################################################################
 # PLATFORM HEADER SEARCH PATHS
@@ -431,10 +431,10 @@ afterplatform: $(TARGET_NAME)
 	@echo TARGET=$(TARGET)
 	@mv $(TARGET) bin/$(BIN_NAME).app/Contents/MacOS
 
-ifneq ($(USE_FMOD),0)
-	@mkdir -p bin/$(BIN_NAME).app/Contents/Frameworks
-	@cp $(OF_LIBS_PATH)/*/lib/$(PLATFORM_LIB_SUBPATH)/*.$(SHARED_LIB_EXTENSION) bin/$(BIN_NAME).app/Contents/Frameworks/;
-endif
+# ifneq ($(USE_FMOD),0)
+# 	@mkdir -p bin/$(BIN_NAME).app/Contents/Frameworks
+# 	@cp $(OF_LIBS_PATH)/*/lib/$(PLATFORM_LIB_SUBPATH)/*.$(SHARED_LIB_EXTENSION) bin/$(BIN_NAME).app/Contents/Frameworks/;
+# endif
 
 	@echo
 	@echo "     compiling done"
diff --git a/libs/openFrameworksCompiled/project/tvOS/CoreOF.xcconfig b/libs/openFrameworksCompiled/project/tvOS/CoreOF.xcconfig
diff --git a/scripts/osx/buildAllExamples.sh b/scripts/osx/buildAllExamples.sh
diff --git a/scripts/templates/ios/Project.xcconfig b/scripts/templates/ios/Project.xcconfig
diff --git a/scripts/templates/tvOS/Project.xcconfig b/scripts/templates/tvOS/Project.xcconfig

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ void ofApp::update(){`
`24`	`24`	`// "lastBuffer" is shared between update() and audioOut(), which are called`
`25`	`25`	`// on two different threads. This lock makes sure we don't use lastBuffer`
`26`	`26`	`// from both threads simultaneously (see the corresponding lock in audioOut())`
`27`		`- unique_lock<mutex> lock(audioMutex);`
	`27`	`+ std::unique_lock<std::mutex> lock(audioMutex);`
`28`	`28`
`29`	`29`	`// this loop is building up a polyline representing the audio contained in`
`30`	`30`	`// the left channel of the buffer`
`@@ -92,7 +92,7 @@ void ofApp::audioOut(ofSoundBuffer &outBuffer) {`
`92`	`92`	`pulsePhase += pulsePhaseStep;`
`93`	`93`	`}`
`94`	`94`
`95`		`- unique_lock<mutex> lock(audioMutex);`
	`95`	`+ std::unique_lock<std::mutex> lock(audioMutex);`
`96`	`96`	`lastBuffer = outBuffer;`
`97`	`97`	`}`
`98`	`98`