Merge branch 'master' into nofmod

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:
 

addons/ofxiOS/src/video/AVFoundationVideoGrabber.mm

@@ -53,15 +53,23 @@ - (instancetype)init {
 }
 
 - (BOOL)initCapture:(int)framerate capWidth:(int)w capHeight:(int)h{
-    AVCaptureDeviceDiscoverySession *discoverySession = [AVCaptureDeviceDiscoverySession discoverySessionWithDeviceTypes:@[
-        AVCaptureDeviceTypeBuiltInWideAngleCamera,
-        AVCaptureDeviceTypeBuiltInTelephotoCamera,
-        AVCaptureDeviceTypeBuiltInUltraWideCamera,
-        AVCaptureDeviceTypeBuiltInDualCamera,
-        AVCaptureDeviceTypeBuiltInDualWideCamera,
-        AVCaptureDeviceTypeBuiltInTripleCamera,
-        AVCaptureDeviceTypeExternal
-    ] mediaType:AVMediaTypeVideo position:AVCaptureDevicePositionUnspecified];
+
+	NSMutableArray *deviceTypes = [NSMutableArray arrayWithObjects:AVCaptureDeviceTypeBuiltInWideAngleCamera,
+	AVCaptureDeviceTypeBuiltInTelephotoCamera,
+	AVCaptureDeviceTypeBuiltInUltraWideCamera,
+	AVCaptureDeviceTypeBuiltInDualCamera,
+	AVCaptureDeviceTypeBuiltInDualWideCamera,
+	AVCaptureDeviceTypeBuiltInTripleCamera,
+	AVCaptureDeviceTypeBuiltInTrueDepthCamera, nil];
+	if (@available(iOS 17.0, macCatalyst 17.0, tvOS 17.0, *)) {
+		if (&AVCaptureDeviceTypeContinuityCamera != nil) {
+			[deviceTypes addObject:AVCaptureDeviceTypeContinuityCamera];
+			[deviceTypes addObject:AVCaptureDeviceTypeBuiltInLiDARDepthCamera];
+			[deviceTypes addObject:AVCaptureDeviceTypeBuiltInTrueDepthCamera];
+			[deviceTypes addObject:AVCaptureDeviceTypeExternal];
+		}
+	}
+    AVCaptureDeviceDiscoverySession *discoverySession = [AVCaptureDeviceDiscoverySession discoverySessionWithDeviceTypes:deviceTypes mediaType:AVMediaTypeVideo position:AVCaptureDevicePositionUnspecified];
 
     NSArray<AVCaptureDevice *> *devices = discoverySession.devices;
 	if([devices count] > 0) {
@@ -251,28 +259,26 @@ -(CGImageRef)getCurrentFrame{
 -(std::vector <std::string>)listDevices{
     std::vector <std::string> deviceNames;
     NSArray<AVCaptureDevice *> *devices;
-    if (@available(iOS 17.0, *)) {
-        AVCaptureDeviceDiscoverySession *session = [AVCaptureDeviceDiscoverySession discoverySessionWithDeviceTypes:@[
-            AVCaptureDeviceTypeBuiltInWideAngleCamera,
-            AVCaptureDeviceTypeBuiltInTelephotoCamera,
-            AVCaptureDeviceTypeBuiltInUltraWideCamera,
-            AVCaptureDeviceTypeBuiltInDualCamera,
-            AVCaptureDeviceTypeBuiltInDualWideCamera,
-            AVCaptureDeviceTypeBuiltInTripleCamera,
-            AVCaptureDeviceTypeExternal
-        ] mediaType:AVMediaTypeVideo position:AVCaptureDevicePositionUnspecified];
-        devices = session.devices;
-    } else {
-        AVCaptureDeviceDiscoverySession *session = [AVCaptureDeviceDiscoverySession discoverySessionWithDeviceTypes:@[
-            AVCaptureDeviceTypeBuiltInWideAngleCamera,
-            AVCaptureDeviceTypeBuiltInTelephotoCamera,
-            AVCaptureDeviceTypeBuiltInUltraWideCamera,
-            AVCaptureDeviceTypeBuiltInDualCamera,
-            AVCaptureDeviceTypeBuiltInDualWideCamera,
-            AVCaptureDeviceTypeBuiltInTripleCamera,
-        ] mediaType:AVMediaTypeVideo position:AVCaptureDevicePositionUnspecified];
-        devices = session.devices;
-    }
+	
+	NSMutableArray *deviceTypes = [NSMutableArray arrayWithObjects:AVCaptureDeviceTypeBuiltInWideAngleCamera,
+	AVCaptureDeviceTypeBuiltInTelephotoCamera,
+	AVCaptureDeviceTypeBuiltInUltraWideCamera,
+	AVCaptureDeviceTypeBuiltInDualCamera,
+	AVCaptureDeviceTypeBuiltInDualWideCamera,
+	AVCaptureDeviceTypeBuiltInTripleCamera,
+	AVCaptureDeviceTypeBuiltInTrueDepthCamera,
+							   nil
+	];
+	if (@available(iOS 17.0, macCatalyst 17.0, tvOS 17.0, *)) {
+		if (&AVCaptureDeviceTypeContinuityCamera != nil) {
+			[deviceTypes addObject:AVCaptureDeviceTypeContinuityCamera];
+			[deviceTypes addObject:AVCaptureDeviceTypeBuiltInLiDARDepthCamera];
+			[deviceTypes addObject:AVCaptureDeviceTypeBuiltInTrueDepthCamera];
+			[deviceTypes addObject:AVCaptureDeviceTypeExternal];
+		}
+	}
+	AVCaptureDeviceDiscoverySession *discoverySession = [AVCaptureDeviceDiscoverySession discoverySessionWithDeviceTypes:deviceTypes mediaType:AVMediaTypeVideo position:AVCaptureDevicePositionUnspecified];
+        devices = discoverySession.devices;
 	int i=0;
 	for (AVCaptureDevice * captureDevice in devices){
         deviceNames.push_back([captureDevice.localizedName UTF8String]);
@@ -320,8 +326,8 @@ - (void)captureOutput:(AVCaptureOutput *)captureOutput
 				// Create a CGImageRef from the CVImageBufferRef
 				CGColorSpaceRef colorSpace	= CGColorSpaceCreateDeviceRGB(); 
 
-				CGContextRef newContext		= CGBitmapContextCreate(baseAddress, widthIn, heightIn, 8, bytesPerRow, colorSpace, kCGBitmapByteOrder32Little | kCGImageAlphaPremultipliedFirst);
-				CGImageRef newImage			= CGBitmapContextCreateImage(newContext); 
+				CGContextRef newContext		= CGBitmapContextCreate(baseAddress, widthIn, heightIn, 8, bytesPerRow, colorSpace, (CGBitmapInfo)kCGBitmapByteOrder32Little | (CGBitmapInfo)kCGImageAlphaPremultipliedFirst);
+				CGImageRef newImage			= CGBitmapContextCreateImage(newContext);
 
 				CGImageRelease(currentFrame);	
 				currentFrame = CGImageCreateCopy(newImage);		

examples/sound/audioInputExample/src/ofApp.cpp

@@ -9,10 +9,9 @@ void ofApp::setup(){
 
 	soundStream.printDeviceList();
 
-	int bufferSize = 256;
+	int bufferSize = 512;
 
-	left.assign(bufferSize, 0.0);
-	right.assign(bufferSize, 0.0);
+	
 	volHistory.assign(400, 0.0);
 
 	bufferCounter	= 0;
@@ -28,14 +27,16 @@ void ofApp::setup(){
 	// settings.device = devices[4];
 
 	// you can also get devices for an specific api
-	// auto devices = soundStream.getDevicesByApi(ofSoundDevice::Api::PULSE);
+	// auto devices = soundStream.getDeviceList(ofSoundDevice::Api::PULSE);
 	// settings.device = devices[0];
 
 	// or get the default device for an specific api:
 	// settings.api = ofSoundDevice::Api::PULSE;
 
 	// or by name
+	
 	auto devices = soundStream.getMatchingDevices("default");
+
 	if(!devices.empty()){
 		settings.setInDevice(devices[0]);
 	}
@@ -51,6 +52,11 @@ void ofApp::setup(){
 	settings.bufferSize = bufferSize;
 	soundStream.setup(settings);
 
+	bufferSize = soundStream.getBufferSize();
+
+	left.assign(bufferSize, 0.0);
+	right.assign(bufferSize, 0.0);
+
 }
 
 //--------------------------------------------------------------
@@ -167,8 +173,8 @@ void ofApp::audioIn(ofSoundBuffer & input){
 
 	//lets go through each sample and calculate the root mean square which is a rough way to calculate volume	
 	for (size_t i = 0; i < input.getNumFrames(); i++){
-		left[i]		= input[i*2]*0.5;
-		right[i]	= input[i*2+1]*0.5;
+		left[i]		= input[i]*0.5;
+		right[i]	= input[i]*0.5;
 
 		curVol += left[i] * left[i];
 		curVol += right[i] * right[i];

examples/sound/audioOutputExample/src/ofApp.cpp

@@ -41,15 +41,22 @@ void ofApp::setup(){
 	//		settings.setOutDevice(devices[0]);
 	//	}
 
-#ifdef TARGET_LINUX
+
 	// 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]);
 	}
-#endif
+
+
+
 
 	settings.setOutListener(this);
 	settings.sampleRate = sampleRate;

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;
 		}