fix(macos): wrong type and unnecessary redeclaraton

Hazer · May 13, 2024 · 14828b7 · 14828b7
1 parent ab75ab0
commit 14828b7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/platform/macos/av_video.h b/src/platform/macos/av_video.h
@@ -30,7 +30,7 @@ typedef bool (^FrameCallbackBlock)(CMSampleBufferRef);
 @property (nonatomic, assign) NSMapTable<AVCaptureConnection *, dispatch_semaphore_t> *captureSignals;
 
 + (NSArray<NSDictionary *> *)displayNames;
-+ (NSString *)getDisplayName:(CGDirectDisplayID)displayID;
++ (NSString *)getDisplayName:(CGDirectDisplayID)displayID with: (NSArray<NSScreen*>*)screens;
 
 - (id)initWithDisplay:(CGDirectDisplayID)displayID frameRate:(int)frameRate;
 

diff --git a/src/platform/macos/av_video.m b/src/platform/macos/av_video.m
@@ -18,21 +18,21 @@ @implementation AVVideo
     return [NSArray array];
   }
 
+  NSArray<NSScreen*> *screens = [NSScreen screens];
   NSMutableArray *result = [NSMutableArray array];
 
   for (uint32_t i = 0; i < count; i++) {
     [result addObject:@{
       @"id": [NSNumber numberWithUnsignedInt:displays[i]],
       @"name": [NSString stringWithFormat:@"%d", displays[i]],
-      @"displayName": [self getDisplayName:displays[i]],
+      @"displayName": [self getDisplayName:displays[i] with:screens],
     }];
   }
 
   return [NSArray arrayWithArray:result];
 }
 
-+ (NSString *)getDisplayName:(CGDirectDisplayID)displayID {
-  NSScreen *screens = [NSScreen screens];
++ (NSString *)getDisplayName:(CGDirectDisplayID)displayID with: (NSArray<NSScreen*>*)screens {
   for (NSScreen *screen in screens) {
     if (screen.deviceDescription[@"NSScreenNumber"] == [NSNumber numberWithUnsignedInt:displayID]) {
       return screen.localizedName;