Merge commit '18df276bbff9526d1f1f0a60d0958406abffce58' into macOS-xcframeworks

* commit '18df276bbff9526d1f1f0a60d0958406abffce58':
  Fix for set volume function in Media Foundation player. (#8025)
  Fix for emscripten not being able to render wireframe. though it just renders as GL_LINES and is not visually the same as polygonMode (#8023)
  macOS video player thread priority (#8018)
  Submodules sync and pg fix paths (#8014)

# Conflicts:
#	scripts/apothecary

Author: danoli3

libs/openFrameworks/gl/ofGLProgrammableRenderer.cpp

@@ -233,20 +233,35 @@ void ofGLProgrammableRenderer::drawInstanced(const ofVboMesh & mesh, ofPolyRende
 #if !defined( TARGET_OPENGLES ) || defined(TARGET_EMSCRIPTEN)
 	#if !defined(TARGET_EMSCRIPTEN)
 	glPolygonMode(GL_FRONT_AND_BACK, ofGetGLPolyMode(renderType));
-	#endif
-	if (mesh.getNumIndices() && renderType != OF_MESH_POINTS) {
-		if (primCount <= 1) {
-			drawElements(mesh.getVbo(), mode, mesh.getNumIndices());
+	#else
+	// nh: glPolygonMode is not supported via emscripten,
+	// we can not render wire frames with vbos.
+	// this is not the best solution, but does provide some information
+	// and does not render as solid when wireframe mode is requested.
+	if (renderType == OF_MESH_WIREFRAME) {
+		if (mesh.getNumIndices()) {
+			drawElements(mesh.getVbo(), GL_LINES, mesh.getNumIndices());
 		} else {
-			drawElementsInstanced(mesh.getVbo(), mode, mesh.getNumIndices(), primCount);
+			draw(mesh.getVbo(), GL_LINES, 0, mesh.getNumVertices());
 		}
 	} else {
-		if (primCount <= 1) {
-			draw(mesh.getVbo(), mode, 0, mesh.getNumVertices());
+	#endif
+		if (mesh.getNumIndices() && renderType != OF_MESH_POINTS) {
+			if (primCount <= 1) {
+				drawElements(mesh.getVbo(), mode, mesh.getNumIndices());
+			} else {
+				drawElementsInstanced(mesh.getVbo(), mode, mesh.getNumIndices(), primCount);
+			}
 		} else {
-			drawInstanced(mesh.getVbo(), mode, 0, mesh.getNumVertices(), primCount);
+			if (primCount <= 1) {
+				draw(mesh.getVbo(), mode, 0, mesh.getNumVertices());
+			} else {
+				drawInstanced(mesh.getVbo(), mode, 0, mesh.getNumVertices(), primCount);
+			}
 		}
-	}
+	#if defined(TARGET_EMSCRIPTEN)
+	} // close the if for checking for wireframe
+	#endif
 
 	// tig: note further that we could glGet() and store the current polygon mode, but don't, since that would
 	// infer a massive performance hit. instead, we revert the glPolygonMode to mirror the current ofFill state

libs/openFrameworks/video/ofAVFoundationVideoPlayer.m

@@ -170,7 +170,7 @@ - (BOOL)loadWithURL:(NSURL*)url async:(BOOL)bAsync {
 	if(bAsync == YES){
 		queue = dispatch_get_main_queue();
 	} else {
-		queue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0);
+		queue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0);
 	}
 
 	dispatch_async(queue, ^{

libs/openFrameworks/video/ofMediaFoundationPlayer.cpp

@@ -1084,11 +1084,17 @@ void ofMediaFoundationPlayer::setSpeed(float speed) {
 
 //----------------------------------------------
 void ofMediaFoundationPlayer::setVolume(float volume) {
-    if (m_spMediaEngine) {
-        ofMediaFoundationUtils::CallAsyncBlocking(
-            [&] {m_spMediaEngine->SetVolume(static_cast<double>(volume)); 
-        });
-    }
+	if (m_spMediaEngine) {
+		double cvolume = ofClamp(volume, 0.0f, 1.0f);
+		HRESULT hr = m_spMediaEngine->SetVolume(cvolume);
+		if (hr != S_OK) {
+			ofLogVerbose("ofMediaFoundationPlayer :: setVolume : Unable to set volume to ") << volume << ".";
+		}
+		//ofMediaFoundationUtils::CallAsyncBlocking(
+		//[&] {m_spMediaEngine->SetVolume(static_cast<double>(volume));
+		//[&] {m_spMediaEngine->SetVolume(cvolume);
+		//});
+	}
 }
 
 //----------------------------------------------

scripts/dev/download_pg.sh

@@ -54,7 +54,7 @@ trapError() {
 
     if [ -e openFrameworksLibs* ]; then
         echo "removing packages"
-    	rm openFrameworksLibs*
+        rm openFrameworksLibs*
     fi
     exit "${code}"
 }
@@ -157,7 +157,7 @@ fi
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 cd "$SCRIPT_DIR"
 
-OUTDIR=../../../../
+OUTDIR=../../
 
 
 if [[ $BLEEDING_EDGE = 1 ]] ; then
@@ -190,7 +190,7 @@ cd download
 
 download $PKG
 
-echo " Uncompressing Project Generator for $PLATFORM from $PKG"
+echo " Uncompressing Project Generator for [$PLATFORM] from [$PKG] to [${OUTDIR}/$OUTPUT]"
 if [ "$PLATFORM" == "msys2" ] || [ "$PLATFORM" == "vs" ]; then
     unzip -q "$PKG" -d "$OUTPUT"
     #rm $PKG
@@ -207,17 +207,17 @@ if [ "$PLATFORM" == "msys2" ] || [ "$PLATFORM" == "vs" ]; then
 
     if ! command -v rsync &> /dev/null
     then      
-        cp -ar ${OUTPUT}/ ${OUTDIR}/${OUTPUT}
+        cp -arX ${OUTPUT}/ ${OUTDIR}/${OUTPUT}
     else
         rsync -a ${OUTPUT}/ ${OUTDIR}/${OUTPUT}
     fi
     rm -rf $OUTPUT
 else
     if ! command -v rsync &> /dev/null
     then      
-        cp -ar $OUTPUT/projectGenerator$EXT $OUTDIR/ 
+        cp -arX $OUTPUT/projectGenerator$EXT $OUTDIR/
     else
-        rsync -a $OUTPUT/projectGenerator$EXT $OUTDIR  
+        rsync -a $OUTPUT/projectGenerator$EXT $OUTDIR
     fi
     rm -rf $OUTPUT/projectGenerator$EXT
 
@@ -227,7 +227,4 @@ rm -rf $OUTPUT
 # rm -rf $PKG
 
 echo " ------ "
-echo " openFrameworks download projectGenerator and install complete!"
-
-
-
+echo " openFrameworks download projectGenerator and install complete!"