scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-21 11:40:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Syphon: terminate the mainloop directly

Browse Source 
terminate the mainloop directly if run by us
This commit is contained in:
Martin Pulec
2023-03-27 16:58:58 +02:00
parent a3daa89ef6
commit dfa724fea2
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/video_capture/syphon.mm
View File

@@ -151,7 +151,7 @@ struct state_vidcap_syphon {
int show_help; ///< only show help and exit - 1 - standard; 2 - full
bool probe_devices; ///< devices probed
bool should_exit_main_loop = false; ///< events (probe/help) processed
bool mainloop_started = false; ///< mainloop is started
int probed_devices_count; ///< used only if state_vidcap_syphon::probe_devices is true
struct device_info *probed_devices; ///< used only if state_vidcap_syphon::probe_devices is true
@@ -220,25 +220,18 @@ static void oneshot_init(CFRunLoopTimerRef timer, void *context)
UNUSED(timer);
state_vidcap_syphon *s = (state_vidcap_syphon *) context;
// Although initialization happens only once, it is important that
// timer is periodically triggered because only then is glutCheckLoop()
// left (without that, glutCheckLoop would block infinitely).
// keepalive - we need to check client availability
schedule_next_event(s);
if (s->should_exit_main_loop) {
[[NSApplication sharedApplication] terminate : nil];
return;
}
if (s->show_help != 0) {
usage(s->show_help == 2);
s->should_exit_main_loop = true;
[[NSApplication sharedApplication] terminate : nil];
return;
}
if (s->probe_devices) {
probe_devices_callback(s);
s->should_exit_main_loop = true;
[[NSApplication sharedApplication] terminate : nil];
return;
}
@@ -340,12 +333,15 @@ static void oneshot_init(CFRunLoopTimerRef timer, void *context)
static void should_exit_syphon(void *state) {
struct state_vidcap_syphon *s = (struct state_vidcap_syphon *) state;
s->should_exit_main_loop = true;
if (s->mainloop_started) {
[[NSApplication sharedApplication] terminate : nil];
}
}
static void syphon_mainloop(void *state)
{
UNUSED(state);
struct state_vidcap_syphon *s = (struct state_vidcap_syphon *) state;
s->mainloop_started = true;
[[NSApplication sharedApplication] run];
}