lagertonne/yolobs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

New upstream version 25.0.3+dfsg1

Browse source
This commit is contained in:
Sebastian Ramacher 2020-03-25 09:07:22 +01:00
parent 04fe0efc67
commit 8b2e5f2130
569 changed files with 62491 additions and 5875 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/mac-capture/mac-audio.c
View file

@ -817,6 +817,7 @@ struct obs_source_info coreaudio_input_capture_info = {
.update = coreaudio_update,
.get_defaults = coreaudio_defaults,
.get_properties = coreaudio_input_properties,
.icon_type = OBS_ICON_TYPE_AUDIO_INPUT,
};
struct obs_source_info coreaudio_output_capture_info = {
@ -830,4 +831,5 @@ struct obs_source_info coreaudio_output_capture_info = {
.update = coreaudio_update,
.get_defaults = coreaudio_defaults,
.get_properties = coreaudio_output_properties,
.icon_type = OBS_ICON_TYPE_AUDIO_OUTPUT,
};

1
plugins/mac-capture/mac-display-capture.m
View file

@ -658,4 +658,5 @@ struct obs_source_info display_capture_info = {
.get_defaults = display_capture_defaults,
.get_properties = display_capture_properties,
.update = display_capture_update,
.icon_type = OBS_ICON_TYPE_DESKTOP_CAPTURE,
};

8
plugins/mac-capture/mac-window-capture.m
View file

@ -32,12 +32,7 @@ static CGImageRef get_image(struct window_capture *wc)
kCGWindowListOptionIncludingWindow, wc->window.window_id);
[arr autorelease];
if (arr.count)
return CGWindowListCreateImage(
CGRectNull, kCGWindowListOptionIncludingWindow,
wc->window.window_id, wc->image_option);
if (!find_window(&wc->window, NULL, false))
if (!arr.count && !find_window(&wc->window, NULL, false))
return NULL;
return CGWindowListCreateImage(CGRectNull,
@ -235,4 +230,5 @@ struct obs_source_info window_capture_info = {
.get_defaults = window_capture_defaults,
.get_properties = window_capture_properties,
.update = window_capture_update,
.icon_type = OBS_ICON_TYPE_WINDOW_CAPTURE,
};