Merge pull request #46 from stfufane/fswatcher-mac-deprecated

Update filesystemwatcher deprecated MacOS API
FigBug · Mar 6, 2024 · 93dfb89 · 93dfb89
2 parents 2294811 + 8f6f57c
commit 93dfb89
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -41,10 +41,13 @@
 Debug
 Release
 .vs
+.idea
 *.user
 
 xcuserdata
 Builds
+cmake-build-debug
+cmake-build-release
 JuceLibraryCode
 juce
 bin

diff --git a/modules/gin/utilities/gin_filesystemwatcher.cpp b/modules/gin/utilities/gin_filesystemwatcher.cpp
@@ -21,11 +21,12 @@ class FileSystemWatcher::Impl
         context.release         = nil;
         context.copyDescription = nil;
 
+        dispatch_queue_t queue = dispatch_queue_create("com.gin.filesystemwatcher", DISPATCH_QUEUE_SERIAL);
         stream = FSEventStreamCreate (kCFAllocatorDefault, callback, &context, (CFArrayRef)paths, kFSEventStreamEventIdSinceNow, 0.05,
                                       kFSEventStreamCreateFlagNoDefer | kFSEventStreamCreateFlagFileEvents);
         if (stream)
         {
-            FSEventStreamScheduleWithRunLoop (stream, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode);
+            FSEventStreamSetDispatchQueue(stream, queue);
             FSEventStreamStart (stream);
         }
 
@@ -36,7 +37,7 @@ class FileSystemWatcher::Impl
         if (stream)
         {
             FSEventStreamStop (stream);
-            FSEventStreamUnscheduleFromRunLoop (stream, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode);
+            FSEventStreamSetDispatchQueue(stream, nullptr);
             FSEventStreamInvalidate (stream);
             FSEventStreamRelease (stream);
         }