jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mac-capture: Only find window by window id when owner name and pid match

master
David Bieber 2020-04-05 22:10:36 -04:00
parent 239cad00e4
commit ebbe856d83
2 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/mac-capture/window-utils.h
View File

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

39
plugins/mac-capture/window-utils.m
View File

@ -60,8 +60,10 @@ bool find_window(cocoa_window_t cw, obs_data_t *settings, bool force)
NSNumber *window_id = (NSNumber *)dict[WINDOW_NUMBER]; NSNumber *window_id = (NSNumber *)dict[WINDOW_NUMBER];
cw->window_id = window_id.intValue; cw->window_id = window_id.intValue;
cw->owner_pid = (NSNumber *)dict[OWNER_PID];
obs_data_set_int(settings, "window", cw->window_id); obs_data_set_int(settings, "window", cw->window_id);
obs_data_set_int(settings, "owner_pid", cw->owner_pid.intValue);
return true; return true;
} }
@ -76,10 +78,43 @@ void init_window(cocoa_window_t cw, obs_data_t *settings)
cw->owner_name = @(obs_data_get_string(settings, "owner_name")); cw->owner_name = @(obs_data_get_string(settings, "owner_name"));
cw->window_name = @(obs_data_get_string(settings, "window_name")); cw->window_name = @(obs_data_get_string(settings, "window_name"));
cw->window_id = obs_data_get_int(settings, "window");
[cw->owner_name retain]; [cw->owner_name retain];
[cw->window_name retain]; [cw->window_name retain];
find_window(cw, settings, true);
// Find initial window.
pthread_mutex_lock(&cw->name_lock);
if (!cw->window_name.length && !cw->owner_name.length)
goto invalid_name;
NSNumber *owner_pid = @(obs_data_get_int(settings, "owner_pid"));
NSNumber *window_id = @(obs_data_get_int(settings, "window"));
for (NSDictionary *dict in enumerate_windows()) {
bool owner_names_match =
[cw->owner_name isEqualToString:dict[OWNER_NAME]];
bool ids_match =
[owner_pid isEqualToNumber:dict[OWNER_PID]] &&
[window_id isEqualToNumber:dict[WINDOW_NUMBER]];
bool window_names_match =
[cw->window_name isEqualToString:dict[WINDOW_NAME]];
if (owner_names_match && (ids_match || window_names_match)) {
pthread_mutex_unlock(&cw->name_lock);
NSNumber *window_id = (NSNumber *)dict[WINDOW_NUMBER];
cw->window_id = window_id.intValue;
cw->owner_pid = (NSNumber *)dict[OWNER_PID];
obs_data_set_int(settings, "window", cw->window_id);
obs_data_set_int(settings, "owner_pid",
cw->owner_pid.intValue);
return;
}
}
invalid_name:
pthread_mutex_unlock(&cw->name_lock);
return;
} }
void destroy_window(cocoa_window_t cw) void destroy_window(cocoa_window_t cw)