Merge branch 'openframeworks:master' into avplayer

Author: dimitre

.github/workflows/of.yml

@@ -32,7 +32,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Docker Step
-        run: "docker run -di --name emscripten -v $PWD:/src emscripten/emsdk:3.1.73 bash"
+        run: "docker run -di --name emscripten -v $PWD:/src emscripten/emsdk:3.1.74 bash"
       # - name: Determine Release
       #   id: vars
       #   shell: bash
@@ -173,12 +173,12 @@ jobs:
               suffix: arm-linux-gnueabihf,
               alladdons: 1,
             }
-          - {
-              libs: armv7l,
-              multistrap_arch: armhf,
-              suffix: arm-linux-gnueabihf,
-              alladdons: 1,
-            }
+          # - {
+          #     libs: armv7l,
+          #     multistrap_arch: armhf,
+          #     suffix: arm-linux-gnueabihf,
+          #     alladdons: 1,
+          #   }
           - {
               libs: aarch64,
               multistrap_arch: arm64,

LICENSE.md

@@ -2,7 +2,7 @@
 
 ---
 
-Copyright (c) 2004 - openFrameworks Community
+Copyright (c) 2025 - openFrameworks Community
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

examples/sound/audioOutputExample/src/ofApp.cpp

@@ -45,12 +45,19 @@ void ofApp::setup(){
 	// Latest linux versions default to the HDMI output
 	// this usually fixes that. Also check the list of available
 	// devices if sound doesn't work
+
+	//settings.setApi(ofSoundDevice::MS_ASIO);
+	//settings.setApi(ofSoundDevice::MS_WASAPI);
+	//settings.setApi(ofSoundDevice::MS_DS);
+
 	auto devices = soundStream.getMatchingDevices("default");
 	if(!devices.empty()){
 		settings.setOutDevice(devices[0]);
 	}
 
 
+
+
 	settings.setOutListener(this);
 	settings.sampleRate = sampleRate;
 	settings.numOutputChannels = 2;

libs/openFrameworks/events/ofEvents.cpp

@@ -48,7 +48,7 @@ double ofGetLastFrameTime() {
 	if (window) {
 		return window->events().getLastFrameTime();
 	} else {
-		return 0.f;
+		return 0.0;
 	}
 }
 
@@ -123,9 +123,10 @@ int ofGetPreviousMouseY() {
 }
 
 ofCoreEvents::ofCoreEvents()
-	: targetRate(0)
+	: targetRate(60.0)
+	, fixedRateTimeNanos(std::chrono::nanoseconds(ofGetFixedStepForFps(60.0)))
 	, bFrameRateSet(false)
-	, fps(60)
+	, fps(60.0)
 	, currentMouseX(0)
 	, currentMouseY(0)
 	, previousMouseX(0)
@@ -183,6 +184,7 @@ void ofCoreEvents::enable() {
 
 void ofCoreEvents::setTimeModeSystem() {
 	timeMode = System;
+	fps.setTimeMode(timeMode);
 }
 
 ofTimeMode ofCoreEvents::getTimeMode() const {
@@ -192,11 +194,13 @@ ofTimeMode ofCoreEvents::getTimeMode() const {
 void ofCoreEvents::setTimeModeFixedRate(uint64_t nanosecsPerFrame) {
 	timeMode = FixedRate;
 	fixedRateTimeNanos = std::chrono::nanoseconds(nanosecsPerFrame);
+	fps.setTimeMode(timeMode);
 }
 
 void ofCoreEvents::setTimeModeFiltered(float alpha) {
 	timeMode = Filtered;
 	fps.setFilterAlpha(alpha);
+	fps.setTimeMode(timeMode);
 }
 
 //--------------------------------------
@@ -210,13 +214,18 @@ void ofCoreEvents::setFrameRate(int _targetRate) {
 		bFrameRateSet = false;
 	} else {
 		bFrameRateSet = true;
-		targetRate = _targetRate;
+		targetRate = static_cast<float>(_targetRate);
 
 //		uint64_t nanosPerFrame = 1000000000.0 / (double)targetRate;
 //		timer.setPeriodicEvent(nanosPerFrame);
 
-		timerFps.setFps(targetRate);
+		timerFps.setFps(_targetRate);
+		fps.setTargetFPS(targetRate);
+		if (timeMode == FixedRate) {
+			ofSetTimeModeFixedRate(ofGetFixedStepForFps(targetRate));
+		}
 	}
+	
 }
 
 bool ofCoreEvents::getTargetFrameRateEnabled() const {
@@ -301,15 +310,8 @@ bool ofCoreEvents::notifyUpdate() {
 
 //------------------------------------------
 bool ofCoreEvents::notifyDraw() {
-	auto attended = ofNotifyEvent(draw, voidEventArgs);
-
-	if (bFrameRateSet) {
-//		timer.waitNext();
-		timerFps.waitNext();
-	}
-
 	if (fps.getNumFrames() == 0) {
-		if (bFrameRateSet) fps = ofFpsCounter(targetRate);
+		if (bFrameRateSet) fps = ofFpsCounter(targetRate, timeMode);
 	} else {
 		/*if(ofIsVerticalSyncEnabled()){
 			float rate = ofGetRefreshRate();
@@ -318,7 +320,12 @@ bool ofCoreEvents::notifyDraw() {
 			lastFrameTime = intervals*1000000/rate;
 		}*/
 	}
+	if (bFrameRateSet) {
+//		timer.waitNext();
+		timerFps.waitNext();
+	}
 	fps.newFrame();
+	auto attended = ofNotifyEvent(draw, voidEventArgs);
 	return attended;
 }
 

libs/openFrameworks/events/ofEvents.h

@@ -406,7 +406,7 @@ class ofCoreEvents {
 	bool notifyDragEvent(ofDragInfo info);
 
 private:
-	float targetRate;
+	float targetRate = 60.0f;
 	bool bFrameRateSet;
 	ofTimerFps timerFps;
 //	ofTimer timer;
@@ -420,7 +420,7 @@ class ofCoreEvents {
 	int modifiers = 0;
 
 	enum TimeMode {
-		System,
+		System = 0,
 		FixedRate,
 		Filtered,
 	} timeMode

libs/openFrameworks/sound/ofRtAudioSoundStream.cpp

@@ -140,13 +140,16 @@ bool ofRtAudioSoundStream::setup(const ofSoundStreamSettings & settings_)
 
 	try {
 		if (settings.getApi() != ofSoundDevice::Api::UNSPECIFIED) {
+			ofLogNotice() << "Initialing RtAudio Requested API: " << settings.getApi();
 			audio = std::make_shared<RtAudio>(toRtAudio(settings.getApi()));
 		}else{
+			ofLogNotice() << "Initialing RtAudio with UNSPECIFIED API";
 			audio = std::make_shared<RtAudio>();
 		}
+		ofLogNotice() << "Initialized RtAudio with API: " << RtAudio::getApiName(audio->getCurrentApi());
 	}
 	catch (std::exception &error) {
-		ofLogError() << error.what();
+		ofLogError() << "Failed to initialize RtAudio: " << error.what();
 		return false;
 	}
 
@@ -155,6 +158,7 @@ bool ofRtAudioSoundStream::setup(const ofSoundStreamSettings & settings_)
 	if (settings.numInputChannels > 0) {
 		if (!settings.getInDevice()) {
 			ofSoundDevice device;
+			device.api = settings.getApi();
 			device.deviceID = audio->getDefaultInputDevice();
 			settings.setInDevice(device);
 		}
@@ -165,6 +169,7 @@ bool ofRtAudioSoundStream::setup(const ofSoundStreamSettings & settings_)
 	if (settings.numOutputChannels > 0) {
 		if (!settings.getOutDevice()) {
 			ofSoundDevice device;
+			device.api = settings.getApi();
 			device.deviceID = audio->getDefaultOutputDevice();
 			settings.setOutDevice(device);
 		}

libs/openFrameworks/sound/ofSoundBaseTypes.cpp

@@ -22,18 +22,25 @@ std::string toString(ofSoundDevice::Api api){
 		case ofSoundDevice::MS_DS:
 			return "MS DirectShow";
 		default:
-			return "Unkown API";
+			return "Unknown API";
 	}
 }
 
 
 void ofBaseSoundStream::printDeviceList() const {
 	ofLogNotice("ofBaseSoundStream::printDeviceList") << std::endl;
 #ifndef TARGET_EMSCRIPTEN
-	for(int i=ofSoundDevice::ALSA; i<ofSoundDevice::NUM_APIS; ++i){
-		ofSoundDevice::Api api = (ofSoundDevice::Api)i;
+	std::vector<ofSoundDevice::Api> platformApis;
+#ifdef TARGET_LINUX
+	platformApis = { ofSoundDevice::ALSA, ofSoundDevice::PULSE, ofSoundDevice::OSS, ofSoundDevice::JACK };
+#elif defined(TARGET_OSX)
+	platformApis = { ofSoundDevice::OSX_CORE };
+#elif defined(TARGET_WIN32)
+	platformApis = { ofSoundDevice::MS_WASAPI, ofSoundDevice::MS_ASIO, ofSoundDevice::MS_DS };
+#endif
+	for (auto api : platformApis) {
 		auto devices = getDeviceList(api);
-		if(!devices.empty()){
+		if (!devices.empty()) {
 			ofLogNotice("ofBaseSoundStream::printDeviceList") << "Api: " << toString(api);
 			ofLogNotice("ofBaseSoundStream::printDeviceList") << devices;
 		}

libs/openFrameworks/sound/ofSoundStream.cpp

@@ -66,6 +66,7 @@ bool ofSoundStreamSettings::setInDevice(const ofSoundDevice & device){
 	}
 	api = device.api;
 	inDevice = device;
+	inDevice.api = api;
 	return true;
 }
 
@@ -76,6 +77,7 @@ bool ofSoundStreamSettings::setOutDevice(const ofSoundDevice & device){
 	}
 	api = device.api;
 	outDevice = device;
+	outDevice.api = api;
 	return true;
 }
 
@@ -86,7 +88,7 @@ bool ofSoundStreamSettings::setApi(ofSoundDevice::Api api){
 		return false;
 	}
 	if(api!=ofSoundDevice::UNSPECIFIED && outDevice.deviceID!=-1 && outDevice.api != api){
-		ofLogError("ofSoundStreamSettings") << "Setting API after setting IN device with api: " << toString(outDevice.api) << " won't do anything";
+		ofLogError("ofSoundStreamSettings") << "Setting API after setting OUT device with api: " << toString(outDevice.api) << " won't do anything";
 		return false;
 	}
 	this->api = api;

libs/openFrameworks/utils/ofConstants.h

@@ -150,11 +150,13 @@ enum ofTargetPlatform{
 	#define GLEW_NO_GLU
     #define TARGET_GLFW_WINDOW
     #define OF_CAIRO
-    #define OF_RTAUDIO
 	#include "GL/glew.h"
 	#include "GL/wglew.h"
+	#define OF_RTAUDIO
 	#define __WINDOWS_DS__
-	#define __WINDOWS_MM__
+	#define __WINDOWS_WASAPI__
+	#define __WINDOWS_ASIO__
+	#define __WINDOWS_MM__ // rtMidi?
 	#if (_MSC_VER)       // microsoft visual studio
 		//TODO: Fix this in the code instead of disabling the warnings
 		#define _CRT_SECURE_NO_WARNINGS
@@ -200,18 +202,15 @@ enum ofTargetPlatform{
 #endif
 
 #if defined(TARGET_OS_OSX) && !defined(TARGET_OF_IOS)
-	#ifndef __MACOSX_CORE__
-		#define __MACOSX_CORE__
-	#endif
     #define TARGET_GLFW_WINDOW
     #define OF_CAIRO
     #define OF_RTAUDIO
-    
+	#ifndef __MACOSX_CORE__
+		#define __MACOSX_CORE__ // rtAudio
+	#endif
 	#ifndef OF_NO_FMOD
 		#define OF_NO_FMOD
 	#endif
-
-    
 	#include "GL/glew.h"
     #include "OpenGL/OpenGL.h"
 
@@ -245,6 +244,13 @@ enum ofTargetPlatform{
 	#else // desktop linux
         #define TARGET_GLFW_WINDOW
         #define OF_RTAUDIO
+		#ifndef __LINUX_PULSE__
+			#define __LINUX_PULSE__
+		#endif
+		#ifndef __LINUX_ALSA__
+			#define __LINUX_ALSA__
+		#endif
+		#define __LINUX_OSS__
 		#include <GL/glew.h>
 	#endif