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

Apply clang-format to objective c code

Browse Source
This commit is contained in:
Colin Edwards
2019-07-09 13:29:39 -05:00
parent 617086b040
commit ad85a9fa25
14 changed files with 1103 additions and 1133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

212
plugins/mac-capture/mac-display-capture.m
View File

@@ -120,16 +120,15 @@ static inline void update_window_params(struct display_capture *dc)
if (!requires_window(dc->crop))
return;
NSArray *arr = (NSArray*)CGWindowListCopyWindowInfo(
kCGWindowListOptionIncludingWindow,
dc->window.window_id);
NSArray *arr = (NSArray *)CGWindowListCopyWindowInfo(
kCGWindowListOptionIncludingWindow, dc->window.window_id);
if (arr.count) {
NSDictionary *dict = arr[0];
NSDictionary *ref = dict[(NSString*)kCGWindowBounds];
NSDictionary *ref = dict[(NSString *)kCGWindowBounds];
CGRectMakeWithDictionaryRepresentation((CFDictionaryRef)ref,
&dc->window_rect);
dc->on_screen = dict[(NSString*)kCGWindowIsOnscreen] != nil;
&dc->window_rect);
dc->on_screen = dict[(NSString *)kCGWindowIsOnscreen] != nil;
dc->window_rect =
[dc->screen convertRectToBacking:dc->window_rect];
@@ -144,8 +143,10 @@ static inline void update_window_params(struct display_capture *dc)
}
static inline void display_stream_update(struct display_capture *dc,
CGDisplayStreamFrameStatus status, uint64_t display_time,
IOSurfaceRef frame_surface, CGDisplayStreamUpdateRef update_ref)
CGDisplayStreamFrameStatus status,
uint64_t display_time,
IOSurfaceRef frame_surface,
CGDisplayStreamUpdateRef update_ref)
{
UNUSED_PARAMETER(display_time);
UNUSED_PARAMETER(update_ref);
@@ -176,8 +177,7 @@ static inline void display_stream_update(struct display_capture *dc,
size_t dropped_frames = CGDisplayStreamUpdateGetDropCount(update_ref);
if (dropped_frames > 0)
blog(LOG_INFO, "%s: Dropped %zu frames",
obs_source_get_name(dc->source),
dropped_frames);
obs_source_get_name(dc->source), dropped_frames);
}
static bool init_display_stream(struct display_capture *dc)
@@ -192,38 +192,34 @@ static bool init_display_stream(struct display_capture *dc)
NSNumber *screen_num = dc->screen.deviceDescription[@"NSScreenNumber"];
CGDirectDisplayID disp_id = (CGDirectDisplayID)screen_num.pointerValue;
NSDictionary *rect_dict = CFBridgingRelease(
CGRectCreateDictionaryRepresentation(
CGRectMake(0, 0,
dc->screen.frame.size.width,
dc->screen.frame.size.height)));
NSDictionary *rect_dict =
CFBridgingRelease(CGRectCreateDictionaryRepresentation(
CGRectMake(0, 0, dc->screen.frame.size.width,
dc->screen.frame.size.height)));
CFBooleanRef show_cursor_cf =
dc->hide_cursor ? kCFBooleanFalse : kCFBooleanTrue;
CFBooleanRef show_cursor_cf = dc->hide_cursor ? kCFBooleanFalse
: kCFBooleanTrue;
NSDictionary *dict = @{
(__bridge NSString*)kCGDisplayStreamSourceRect: rect_dict,
(__bridge NSString*)kCGDisplayStreamQueueDepth: @5,
(__bridge NSString*)kCGDisplayStreamShowCursor:
(id)show_cursor_cf,
(__bridge NSString *)kCGDisplayStreamSourceRect: rect_dict,
(__bridge NSString *)kCGDisplayStreamQueueDepth: @5,
(__bridge NSString *)
kCGDisplayStreamShowCursor: (id)show_cursor_cf,
};
os_event_init(&dc->disp_finished, OS_EVENT_TYPE_MANUAL);
const CGSize *size = &dc->frame.size;
dc->disp = CGDisplayStreamCreateWithDispatchQueue(disp_id,
size->width, size->height, 'BGRA',
(__bridge CFDictionaryRef)dict,
dispatch_queue_create(NULL, NULL),
^(CGDisplayStreamFrameStatus status,
uint64_t displayTime,
IOSurfaceRef frameSurface,
CGDisplayStreamUpdateRef updateRef)
{
display_stream_update(dc, status, displayTime,
frameSurface, updateRef);
}
);
dc->disp = CGDisplayStreamCreateWithDispatchQueue(
disp_id, size->width, size->height, 'BGRA',
(__bridge CFDictionaryRef)dict,
dispatch_queue_create(NULL, NULL),
^(CGDisplayStreamFrameStatus status, uint64_t displayTime,
IOSurfaceRef frameSurface,
CGDisplayStreamUpdateRef updateRef) {
display_stream_update(dc, status, displayTime,
frameSurface, updateRef);
});
return !CGDisplayStreamStart(dc->disp);
}
@@ -252,8 +248,7 @@ bool init_vertbuf(struct display_capture *dc)
void load_crop(struct display_capture *dc, obs_data_t *settings);
static void *display_capture_create(obs_data_t *settings,
obs_source_t *source)
static void *display_capture_create(obs_data_t *settings, obs_source_t *source)
{
UNUSED_PARAMETER(source);
UNUSED_PARAMETER(settings);
@@ -303,25 +298,24 @@ fail:
}
static void build_sprite(struct gs_vb_data *data, float fcx, float fcy,
float start_u, float end_u, float start_v, float end_v)
float start_u, float end_u, float start_v, float end_v)
{
struct vec2 *tvarray = data->tvarray[0].array;
vec3_set(data->points+1, fcx, 0.0f, 0.0f);
vec3_set(data->points+2, 0.0f, fcy, 0.0f);
vec3_set(data->points+3, fcx, fcy, 0.0f);
vec2_set(tvarray, start_u, start_v);
vec2_set(tvarray+1, end_u, start_v);
vec2_set(tvarray+2, start_u, end_v);
vec2_set(tvarray+3, end_u, end_v);
vec3_set(data->points + 1, fcx, 0.0f, 0.0f);
vec3_set(data->points + 2, 0.0f, fcy, 0.0f);
vec3_set(data->points + 3, fcx, fcy, 0.0f);
vec2_set(tvarray, start_u, start_v);
vec2_set(tvarray + 1, end_u, start_v);
vec2_set(tvarray + 2, start_u, end_v);
vec2_set(tvarray + 3, end_u, end_v);
}
static inline void build_sprite_rect(struct gs_vb_data *data,
float origin_x, float origin_y, float end_x, float end_y)
static inline void build_sprite_rect(struct gs_vb_data *data, float origin_x,
float origin_y, float end_x, float end_y)
{
build_sprite(data, fabs(end_x - origin_x), fabs(end_y - origin_y),
origin_x, end_x,
origin_y, end_y);
origin_x, end_x, origin_y, end_y);
}
static void display_capture_video_tick(void *data, float seconds)
@@ -348,8 +342,8 @@ static void display_capture_video_tick(void *data, float seconds)
if (requires_window(dc->crop) && !dc->on_screen)
goto cleanup;
CGPoint origin = { 0.f };
CGPoint end = { 0.f };
CGPoint origin = {0.f};
CGPoint end = {0.f};
switch (dc->crop) {
float x, y;
@@ -379,10 +373,9 @@ static void display_capture_video_tick(void *data, float seconds)
break;
}
obs_enter_graphics();
build_sprite_rect(gs_vertexbuffer_get_data(dc->vertbuf),
origin.x, origin.y, end.x, end.y);
build_sprite_rect(gs_vertexbuffer_get_data(dc->vertbuf), origin.x,
origin.y, end.x, end.y);
if (dc->tex)
gs_texture_rebind_iosurface(dc->tex, dc->prev);
@@ -412,7 +405,7 @@ static void display_capture_video_render(void *data, gs_effect_t *effect)
gs_load_samplerstate(dc->sampler, 0);
gs_technique_t *tech = gs_effect_get_technique(dc->effect, "Draw");
gs_effect_set_texture(gs_effect_get_param_by_name(dc->effect, "image"),
dc->tex);
dc->tex);
gs_technique_begin(tech);
gs_technique_begin_pass(tech, 0);
@@ -428,9 +421,9 @@ static const char *display_capture_getname(void *unused)
return obs_module_text("DisplayCapture");
}
#define CROPPED_LENGTH(rect, origin_, length) \
fabs((rect ## .size. ## length - dc->crop_rect.size. ## length) - \
(rect ## .origin. ## origin_ + dc->crop_rect.origin. ## origin_))
#define CROPPED_LENGTH(rect, origin_, length) \
fabs((rect##.size.##length - dc->crop_rect.size.##length) - \
(rect##.origin.##origin_ + dc->crop_rect.origin.##origin_))
static uint32_t display_capture_getwidth(void *data)
{
@@ -502,20 +495,20 @@ void load_crop(struct display_capture *dc, obs_data_t *settings)
#define CROP_VAR_NAME(var, mode) (mode "." #var)
#define LOAD_CROP_VAR(var, mode) \
dc->crop_rect.var = obs_data_get_double(settings, \
CROP_VAR_NAME(var, mode));
dc->crop_rect.var = \
obs_data_get_double(settings, CROP_VAR_NAME(var, mode));
switch (dc->crop) {
case CROP_MANUAL:
LOAD_CROP_VAR(origin.x, "manual");
LOAD_CROP_VAR(origin.y, "manual");
LOAD_CROP_VAR(size.width, "manual");
LOAD_CROP_VAR(origin.x, "manual");
LOAD_CROP_VAR(origin.y, "manual");
LOAD_CROP_VAR(size.width, "manual");
LOAD_CROP_VAR(size.height, "manual");
break;
case CROP_TO_WINDOW_AND_MANUAL:
LOAD_CROP_VAR(origin.x, "window");
LOAD_CROP_VAR(origin.y, "window");
LOAD_CROP_VAR(size.width, "window");
LOAD_CROP_VAR(origin.x, "window");
LOAD_CROP_VAR(origin.y, "window");
LOAD_CROP_VAR(size.width, "window");
LOAD_CROP_VAR(size.height, "window");
break;
@@ -552,7 +545,7 @@ static void display_capture_update(void *data, obs_data_t *settings)
}
static bool switch_crop_mode(obs_properties_t *props, obs_property_t *p,
obs_data_t *settings)
obs_data_t *settings)
{
UNUSED_PARAMETER(p);
@@ -561,20 +554,20 @@ static bool switch_crop_mode(obs_properties_t *props, obs_property_t *p,
const char *name;
bool visible;
#define LOAD_CROP_VAR(var, mode) \
#define LOAD_CROP_VAR(var, mode) \
name = CROP_VAR_NAME(var, mode); \
obs_property_set_visible(obs_properties_get(props, name), visible);
visible = crop == CROP_MANUAL;
LOAD_CROP_VAR(origin.x, "manual");
LOAD_CROP_VAR(origin.y, "manual");
LOAD_CROP_VAR(size.width, "manual");
LOAD_CROP_VAR(origin.x, "manual");
LOAD_CROP_VAR(origin.y, "manual");
LOAD_CROP_VAR(size.width, "manual");
LOAD_CROP_VAR(size.height, "manual");
visible = crop == CROP_TO_WINDOW_AND_MANUAL;
LOAD_CROP_VAR(origin.x, "window");
LOAD_CROP_VAR(origin.y, "window");
LOAD_CROP_VAR(size.width, "window");
LOAD_CROP_VAR(origin.x, "window");
LOAD_CROP_VAR(origin.y, "window");
LOAD_CROP_VAR(size.width, "window");
LOAD_CROP_VAR(size.height, "window");
#undef LOAD_CROP_VAR
@@ -582,15 +575,12 @@ static bool switch_crop_mode(obs_properties_t *props, obs_property_t *p,
return true;
}
static const char *crop_names[] = {
"CropMode.None",
"CropMode.Manual",
"CropMode.ToWindow",
"CropMode.ToWindowAndManual"
};
static const char *crop_names[] = {"CropMode.None", "CropMode.Manual",
"CropMode.ToWindow",
"CropMode.ToWindowAndManual"};
#ifndef COUNTOF
#define COUNTOF(x) (sizeof(x)/sizeof(x[0]))
#define COUNTOF(x) (sizeof(x) / sizeof(x[0]))
#endif
static obs_properties_t *display_capture_properties(void *unused)
{
@@ -598,9 +588,9 @@ static obs_properties_t *display_capture_properties(void *unused)
obs_properties_t *props = obs_properties_create();
obs_property_t *list = obs_properties_add_list(props,
"display", obs_module_text("DisplayCapture.Display"),
OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
obs_property_t *list = obs_properties_add_list(
props, "display", obs_module_text("DisplayCapture.Display"),
OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
for (unsigned i = 0; i < [NSScreen screens].count; i++) {
char buf[10];
@@ -609,11 +599,11 @@ static obs_properties_t *display_capture_properties(void *unused)
}
obs_properties_add_bool(props, "show_cursor",
obs_module_text("DisplayCapture.ShowCursor"));
obs_module_text("DisplayCapture.ShowCursor"));
obs_property_t *crop = obs_properties_add_list(props, "crop_mode",
obs_module_text("CropMode"),
OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
obs_property_t *crop = obs_properties_add_list(
props, "crop_mode", obs_module_text("CropMode"),
OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
obs_property_set_modified_callback(crop, switch_crop_mode);
for (unsigned i = 0; i < COUNTOF(crop_names); i++) {
@@ -627,22 +617,22 @@ static obs_properties_t *display_capture_properties(void *unused)
obs_property_t *p;
const char *name;
float min;
#define LOAD_CROP_VAR(var, mode) \
name = CROP_VAR_NAME(var, mode); \
p = obs_properties_add_float(props, name, \
obs_module_text("Crop."#var), min, 4096.f, .5f); \
#define LOAD_CROP_VAR(var, mode) \
name = CROP_VAR_NAME(var, mode); \
p = obs_properties_add_float( \
props, name, obs_module_text("Crop." #var), min, 4096.f, .5f); \
obs_property_set_visible(p, false);
min = 0.f;
LOAD_CROP_VAR(origin.x, "manual");
LOAD_CROP_VAR(origin.y, "manual");
LOAD_CROP_VAR(size.width, "manual");
LOAD_CROP_VAR(origin.x, "manual");
LOAD_CROP_VAR(origin.y, "manual");
LOAD_CROP_VAR(size.width, "manual");
LOAD_CROP_VAR(size.height, "manual");
min = -4096.f;
LOAD_CROP_VAR(origin.x, "window");
LOAD_CROP_VAR(origin.y, "window");
LOAD_CROP_VAR(size.width, "window");
LOAD_CROP_VAR(origin.x, "window");
LOAD_CROP_VAR(origin.y, "window");
LOAD_CROP_VAR(size.width, "window");
LOAD_CROP_VAR(size.height, "window");
#undef LOAD_CROP_VAR
@@ -650,22 +640,22 @@ static obs_properties_t *display_capture_properties(void *unused)
}
struct obs_source_info display_capture_info = {
.id = "display_capture",
.type = OBS_SOURCE_TYPE_INPUT,
.get_name = display_capture_getname,
.id = "display_capture",
.type = OBS_SOURCE_TYPE_INPUT,
.get_name = display_capture_getname,
.create = display_capture_create,
.destroy = display_capture_destroy,
.create = display_capture_create,
.destroy = display_capture_destroy,
.output_flags = OBS_SOURCE_VIDEO | OBS_SOURCE_CUSTOM_DRAW |
OBS_SOURCE_DO_NOT_DUPLICATE,
.video_tick = display_capture_video_tick,
.video_render = display_capture_video_render,
.output_flags = OBS_SOURCE_VIDEO | OBS_SOURCE_CUSTOM_DRAW |
OBS_SOURCE_DO_NOT_DUPLICATE,
.video_tick = display_capture_video_tick,
.video_render = display_capture_video_render,
.get_width = display_capture_getwidth,
.get_height = display_capture_getheight,
.get_width = display_capture_getwidth,
.get_height = display_capture_getheight,
.get_defaults = display_capture_defaults,
.get_defaults = display_capture_defaults,
.get_properties = display_capture_properties,
.update = display_capture_update,
.update = display_capture_update,
};

89
plugins/mac-capture/mac-window-capture.m
View File

@@ -21,61 +21,59 @@ struct window_capture {
DARRAY(uint8_t) buffer;
pthread_t capture_thread;
pthread_t capture_thread;
os_event_t *capture_event;
os_event_t *stop_event;
};
static CGImageRef get_image(struct window_capture *wc)
{
NSArray *arr = (NSArray*)CGWindowListCreate(
kCGWindowListOptionIncludingWindow,
wc->window.window_id);
NSArray *arr = (NSArray *)CGWindowListCreate(
kCGWindowListOptionIncludingWindow, wc->window.window_id);
[arr autorelease];
if (arr.count)
return CGWindowListCreateImage(CGRectNull,
kCGWindowListOptionIncludingWindow,
wc->window.window_id, wc->image_option);
return CGWindowListCreateImage(
CGRectNull, kCGWindowListOptionIncludingWindow,
wc->window.window_id, wc->image_option);
if (!find_window(&wc->window, NULL, false))
return NULL;
return CGWindowListCreateImage(CGRectNull,
kCGWindowListOptionIncludingWindow,
wc->window.window_id, wc->image_option);
kCGWindowListOptionIncludingWindow,
wc->window.window_id, wc->image_option);
}
static inline void capture_frame(struct window_capture *wc)
{
uint64_t ts = os_gettime_ns();
uint64_t ts = os_gettime_ns();
CGImageRef img = get_image(wc);
if (!img)
return;
size_t width = CGImageGetWidth(img);
size_t width = CGImageGetWidth(img);
size_t height = CGImageGetHeight(img);
CGRect rect = {{0, 0}, {width, height}};
da_reserve(wc->buffer, width * height * 4);
uint8_t *data = wc->buffer.array;
CGContextRef cg_context = CGBitmapContextCreate(data, width, height,
8, width * 4, wc->color_space,
kCGBitmapByteOrder32Host |
kCGImageAlphaPremultipliedFirst);
CGContextRef cg_context = CGBitmapContextCreate(
data, width, height, 8, width * 4, wc->color_space,
kCGBitmapByteOrder32Host | kCGImageAlphaPremultipliedFirst);
CGContextSetBlendMode(cg_context, kCGBlendModeCopy);
CGContextDrawImage(cg_context, rect, img);
CGContextRelease(cg_context);
CGImageRelease(img);
struct obs_source_frame frame = {
.format = VIDEO_FORMAT_BGRA,
.width = width,
.height = height,
.data[0] = data,
.format = VIDEO_FORMAT_BGRA,
.width = width,
.height = height,
.data[0] = data,
.linesize[0] = width * 4,
.timestamp = ts,
.timestamp = ts,
};
obs_source_output_video(wc->source, &frame);
@@ -99,7 +97,7 @@ static void *capture_thread(void *data)
}
static inline void *window_capture_create_internal(obs_data_t *settings,
obs_source_t *source)
obs_source_t *source)
{
struct window_capture *wc = bzalloc(sizeof(struct window_capture));
@@ -111,8 +109,9 @@ static inline void *window_capture_create_internal(obs_data_t *settings,
init_window(&wc->window, settings);
wc->image_option = obs_data_get_bool(settings, "show_shadow") ?
kCGWindowImageDefault : kCGWindowImageBoundsIgnoreFraming;
wc->image_option = obs_data_get_bool(settings, "show_shadow")
? kCGWindowImageDefault
: kCGWindowImageBoundsIgnoreFraming;
os_event_init(&wc->capture_event, OS_EVENT_TYPE_AUTO);
os_event_init(&wc->stop_event, OS_EVENT_TYPE_MANUAL);
@@ -135,7 +134,7 @@ static void window_capture_destroy(void *data)
os_event_signal(cap->stop_event);
os_event_signal(cap->capture_event);
pthread_join(cap->capture_thread, NULL);
CGColorSpaceRelease(cap->color_space);
@@ -165,26 +164,28 @@ static obs_properties_t *window_capture_properties(void *unused)
add_window_properties(props);
obs_properties_add_bool(props, "show_shadow",
obs_module_text("WindowCapture.ShowShadow"));
obs_module_text("WindowCapture.ShowShadow"));
return props;
}
static inline void window_capture_update_internal(struct window_capture *wc,
obs_data_t *settings)
obs_data_t *settings)
{
wc->image_option = obs_data_get_bool(settings, "show_shadow") ?
kCGWindowImageDefault : kCGWindowImageBoundsIgnoreFraming;
wc->image_option = obs_data_get_bool(settings, "show_shadow")
? kCGWindowImageDefault
: kCGWindowImageBoundsIgnoreFraming;
update_window(&wc->window, settings);
if (wc->window.window_name.length) {
blog(LOG_INFO, "[window-capture: '%s'] update settings:\n"
"\twindow: %s\n"
"\towner: %s",
obs_source_get_name(wc->source),
[wc->window.window_name UTF8String],
[wc->window.owner_name UTF8String]);
blog(LOG_INFO,
"[window-capture: '%s'] update settings:\n"
"\twindow: %s\n"
"\towner: %s",
obs_source_get_name(wc->source),
[wc->window.window_name UTF8String],
[wc->window.owner_name UTF8String]);
}
}
@@ -202,7 +203,7 @@ static const char *window_capture_getname(void *unused)
}
static inline void window_capture_tick_internal(struct window_capture *wc,
float seconds)
float seconds)
{
UNUSED_PARAMETER(seconds);
os_event_signal(wc->capture_event);
@@ -221,17 +222,17 @@ static void window_capture_tick(void *data, float seconds)
}
struct obs_source_info window_capture_info = {
.id = "window_capture",
.type = OBS_SOURCE_TYPE_INPUT,
.get_name = window_capture_getname,
.id = "window_capture",
.type = OBS_SOURCE_TYPE_INPUT,
.get_name = window_capture_getname,
.create = window_capture_create,
.destroy = window_capture_destroy,
.create = window_capture_create,
.destroy = window_capture_destroy,
.output_flags = OBS_SOURCE_ASYNC_VIDEO,
.video_tick = window_capture_tick,
.output_flags = OBS_SOURCE_ASYNC_VIDEO,
.video_tick = window_capture_tick,
.get_defaults = window_capture_defaults,
.get_defaults = window_capture_defaults,
.get_properties = window_capture_properties,
.update = window_capture_update,
.update = window_capture_update,
};

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

@@ -5,11 +5,11 @@
#include <obs-module.h>
struct cocoa_window {
CGWindowID window_id;
CGWindowID window_id;
pthread_mutex_t name_lock;
NSString *owner_name;
NSString *window_name;
NSString *owner_name;
NSString *window_name;
uint64_t next_search_time;
};

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

@@ -2,13 +2,12 @@
#include <util/platform.h>
#define WINDOW_NAME ((NSString*)kCGWindowName)
#define WINDOW_NUMBER ((NSString*)kCGWindowNumber)
#define OWNER_NAME ((NSString*)kCGWindowOwnerName)
#define OWNER_PID ((NSNumber*)kCGWindowOwnerPID)
#define WINDOW_NAME ((NSString *)kCGWindowName)
#define WINDOW_NUMBER ((NSString *)kCGWindowNumber)
#define OWNER_NAME ((NSString *)kCGWindowOwnerName)
#define OWNER_PID ((NSNumber *)kCGWindowOwnerPID)
static NSComparator win_info_cmp = ^(NSDictionary *o1, NSDictionary *o2)
{
static NSComparator win_info_cmp = ^(NSDictionary *o1, NSDictionary *o2) {
NSComparisonResult res = [o1[OWNER_NAME] compare:o2[OWNER_NAME]];
if (res != NSOrderedSame)
return res;
@@ -26,9 +25,8 @@ static NSComparator win_info_cmp = ^(NSDictionary *o1, NSDictionary *o2)
NSArray *enumerate_windows(void)
{
NSArray *arr = (NSArray*)CGWindowListCopyWindowInfo(
kCGWindowListOptionOnScreenOnly,
kCGNullWindowID);
NSArray *arr = (NSArray *)CGWindowListCopyWindowInfo(
kCGWindowListOptionOnScreenOnly, kCGNullWindowID);
[arr autorelease];
@@ -60,8 +58,8 @@ bool find_window(cocoa_window_t cw, obs_data_t *settings, bool force)
pthread_mutex_unlock(&cw->name_lock);
NSNumber *window_id = (NSNumber*)dict[WINDOW_NUMBER];
cw->window_id = window_id.intValue;
NSNumber *window_id = (NSNumber *)dict[WINDOW_NUMBER];
cw->window_id = window_id.intValue;
obs_data_set_int(settings, "window", cw->window_id);
return true;
@@ -76,9 +74,9 @@ void init_window(cocoa_window_t cw, obs_data_t *settings)
{
pthread_mutex_init(&cw->name_lock, NULL);
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->owner_name retain];
[cw->owner_name retain];
[cw->window_name retain];
find_window(cw, settings, true);
}
@@ -86,22 +84,22 @@ void init_window(cocoa_window_t cw, obs_data_t *settings)
void destroy_window(cocoa_window_t cw)
{
pthread_mutex_destroy(&cw->name_lock);
[cw->owner_name release];
[cw->owner_name release];
[cw->window_name release];
}
void update_window(cocoa_window_t cw, obs_data_t *settings)
{
pthread_mutex_lock(&cw->name_lock);
[cw->owner_name release];
[cw->owner_name release];
[cw->window_name release];
cw->owner_name = @(obs_data_get_string(settings, "owner_name"));
cw->window_name = @(obs_data_get_string(settings, "window_name"));
[cw->owner_name retain];
cw->owner_name = @(obs_data_get_string(settings, "owner_name"));
cw->window_name = @(obs_data_get_string(settings, "window_name"));
[cw->owner_name retain];
[cw->window_name retain];
pthread_mutex_unlock(&cw->name_lock);
cw->window_id = obs_data_get_int(settings, "window");
cw->window_id = obs_data_get_int(settings, "window");
}
static inline const char *make_name(NSString *owner, NSString *name)
@@ -116,7 +114,7 @@ static inline const char *make_name(NSString *owner, NSString *name)
static inline NSDictionary *find_window_dict(NSArray *arr, int window_id)
{
for (NSDictionary *dict in arr) {
NSNumber *wid = (NSNumber*)dict[WINDOW_NUMBER];
NSNumber *wid = (NSNumber *)dict[WINDOW_NUMBER];
if (wid.intValue == window_id)
return dict;
}
@@ -125,12 +123,11 @@ static inline NSDictionary *find_window_dict(NSArray *arr, int window_id)
}
static inline bool window_changed_internal(obs_property_t *p,
obs_data_t *settings)
obs_data_t *settings)
{
int window_id = obs_data_get_int(settings, "window");
int window_id = obs_data_get_int(settings, "window");
NSString *window_owner = @(obs_data_get_string(settings, "owner_name"));
NSString *window_name =
@(obs_data_get_string(settings, "window_name"));
NSString *window_name = @(obs_data_get_string(settings, "window_name"));
NSDictionary *win_info = @{
OWNER_NAME: window_owner,
@@ -147,39 +144,38 @@ static inline bool window_changed_internal(obs_property_t *p,
obs_property_list_clear(p);
for (NSDictionary *dict in arr) {
NSString *owner = (NSString*)dict[OWNER_NAME];
NSString *name = (NSString*)dict[WINDOW_NAME];
NSNumber *wid = (NSNumber*)dict[WINDOW_NUMBER];
NSString *owner = (NSString *)dict[OWNER_NAME];
NSString *name = (NSString *)dict[WINDOW_NAME];
NSNumber *wid = (NSNumber *)dict[WINDOW_NUMBER];
if (!window_added &&
win_info_cmp(win_info, dict) == NSOrderedAscending) {
win_info_cmp(win_info, dict) == NSOrderedAscending) {
window_added = true;
size_t idx = obs_property_list_add_int(p,
make_name(window_owner, window_name),
window_id);
size_t idx = obs_property_list_add_int(
p, make_name(window_owner, window_name),
window_id);
obs_property_list_item_disable(p, idx, true);
}
if (!show_empty_names && !name.length &&
window_id != wid.intValue)
window_id != wid.intValue)
continue;
obs_property_list_add_int(p, make_name(owner, name),
wid.intValue);
wid.intValue);
}
if (!window_added) {
size_t idx = obs_property_list_add_int(p,
make_name(window_owner, window_name),
window_id);
size_t idx = obs_property_list_add_int(
p, make_name(window_owner, window_name), window_id);
obs_property_list_item_disable(p, idx, true);
}
if (!window_found)
return true;
NSString *owner = (NSString*)cur[OWNER_NAME];
NSString *window = (NSString*)cur[WINDOW_NAME];
NSString *owner = (NSString *)cur[OWNER_NAME];
NSString *window = (NSString *)cur[WINDOW_NAME];
obs_data_set_string(settings, "owner_name", owner.UTF8String);
obs_data_set_string(settings, "window_name", window.UTF8String);
@@ -188,7 +184,7 @@ static inline bool window_changed_internal(obs_property_t *p,
}
static bool window_changed(obs_properties_t *props, obs_property_t *p,
obs_data_t *settings)
obs_data_t *settings)
{
UNUSED_PARAMETER(props);
@@ -198,12 +194,12 @@ static bool window_changed(obs_properties_t *props, obs_property_t *p,
}
static bool toggle_empty_names(obs_properties_t *props, obs_property_t *p,
obs_data_t *settings)
obs_data_t *settings)
{
UNUSED_PARAMETER(p);
return window_changed(props, obs_properties_get(props, "window"),
settings);
settings);
}
void window_defaults(obs_data_t *settings)
@@ -214,20 +210,20 @@ void window_defaults(obs_data_t *settings)
void add_window_properties(obs_properties_t *props)
{
obs_property_t *window_list = obs_properties_add_list(props,
"window", obs_module_text("WindowUtils.Window"),
OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
obs_property_t *window_list = obs_properties_add_list(
props, "window", obs_module_text("WindowUtils.Window"),
OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
obs_property_set_modified_callback(window_list, window_changed);
obs_property_t *empty = obs_properties_add_bool(props,
"show_empty_names",
obs_module_text("WindowUtils.ShowEmptyNames"));
obs_property_t *empty = obs_properties_add_bool(
props, "show_empty_names",
obs_module_text("WindowUtils.ShowEmptyNames"));
obs_property_set_modified_callback(empty, toggle_empty_names);
}
void show_window_properties(obs_properties_t *props, bool show)
{
obs_property_set_visible(obs_properties_get(props, "window"), show);
obs_property_set_visible(
obs_properties_get(props, "show_empty_names"), show);
obs_property_set_visible(obs_properties_get(props, "show_empty_names"),
show);
}