Merge branch 'main' into xcode15.3-bump

dalexsoto · May 23, 2024 · c102d7c · c102d7c
2 parents 80007fb + 26e6bb8
commit c102d7c
Show file tree

Hide file tree

Showing 14 changed files with 269 additions and 220 deletions.
diff --git a/src/AudioUnit/AUGraph.cs b/src/AudioUnit/AUGraph.cs
@@ -362,7 +362,7 @@ public AUGraphError SetNodeInputCallback (int destNode, uint destInputNumber, Re
 				cb.Proc = &RenderCallbackImpl;
 			}
 #else
-			cb.Proc = CreateRenderCallback;
+			cb.Proc = Marshal.GetFunctionPointerForDelegate (CreateRenderCallback);
 #endif
 			cb.ProcRefCon = GCHandle.ToIntPtr (gcHandle);
 			return AUGraphSetNodeInputCallback (Handle, destNode, destInputNumber, ref cb);

diff --git a/src/AudioUnit/AUScheduledAudioFileRegion.cs b/src/AudioUnit/AUScheduledAudioFileRegion.cs
@@ -35,7 +35,7 @@ internal struct ScheduledAudioFileRegion {
 #if NET
 			public unsafe delegate* unmanaged<IntPtr, IntPtr, AudioUnitStatus, void> CompletionHandler;
 #else
-			public ScheduledAudioFileRegionCompletionHandler CompletionHandler;
+			public IntPtr CompletionHandler;
 #endif
 			public /* void * */ IntPtr CompletionHandlerUserData;
 			public IntPtr AudioFile;
@@ -113,7 +113,7 @@ internal ScheduledAudioFileRegion GetAudioFileRegion ()
 #if NET
 					ret.CompletionHandler = &ScheduledAudioFileRegionCallback;
 #else
-					ret.CompletionHandler = static_ScheduledAudioFileRegionCompletionHandler;
+					ret.CompletionHandler = Marshal.GetFunctionPointerForDelegate (static_ScheduledAudioFileRegionCompletionHandler);
 #endif
 				}
 			}