瀏覽代碼

mac-capture: Use int in place of NSNumber for owner_pid

David Bieber 5 年之前
父節點
當前提交
4718e5ecf5
共有 2 個文件被更改,包括 7 次插入6 次删除
  1. 1 1
      plugins/mac-capture/window-utils.h
  2. 6 5
      plugins/mac-capture/window-utils.m

+ 1 - 1
plugins/mac-capture/window-utils.h

@@ -6,7 +6,7 @@
 
 struct cocoa_window {
 	CGWindowID window_id;
-	NSNumber *owner_pid;
+	int owner_pid;
 
 	pthread_mutex_t name_lock;
 	NSString *owner_name;

+ 6 - 5
plugins/mac-capture/window-utils.m

@@ -60,10 +60,11 @@ bool find_window(cocoa_window_t cw, obs_data_t *settings, bool force)
 
 		NSNumber *window_id = (NSNumber *)dict[WINDOW_NUMBER];
 		cw->window_id = window_id.intValue;
-		cw->owner_pid = (NSNumber *)dict[OWNER_PID];
+		NSNumber *owner_pid = (NSNumber *)dict[OWNER_PID];
+		cw->owner_pid = owner_pid.intValue;
 
 		obs_data_set_int(settings, "window", cw->window_id);
-		obs_data_set_int(settings, "owner_pid", cw->owner_pid.intValue);
+		obs_data_set_int(settings, "owner_pid", cw->owner_pid);
 		return true;
 	}
 
@@ -103,11 +104,11 @@ void init_window(cocoa_window_t cw, obs_data_t *settings)
 
 			NSNumber *window_id = (NSNumber *)dict[WINDOW_NUMBER];
 			cw->window_id = window_id.intValue;
-			cw->owner_pid = (NSNumber *)dict[OWNER_PID];
+			NSNumber *owner_pid = (NSNumber *)dict[OWNER_PID];
+			cw->owner_pid = owner_pid.intValue;
 
 			obs_data_set_int(settings, "window", cw->window_id);
-			obs_data_set_int(settings, "owner_pid",
-					 cw->owner_pid.intValue);
+			obs_data_set_int(settings, "owner_pid", cw->owner_pid);
 			return;
 		}
 	}