From 78a2d99de130cc8e6adc18c5d7a987c5c8b2d2b3 Mon Sep 17 00:00:00 2001 From: FRAU KOUJIRO Date: Tue, 15 Apr 2014 17:09:47 -0700 Subject: cocoa: sync inputContext inside EventsResponder --- osdep/macosx_application.m | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'osdep/macosx_application.m') diff --git a/osdep/macosx_application.m b/osdep/macosx_application.m index f6061fe76a..9aff6e814b 100644 --- a/osdep/macosx_application.m +++ b/osdep/macosx_application.m @@ -318,10 +318,7 @@ int cocoa_main(mpv_main_fn mpv_main, int argc, char *argv[]) macosx_finder_args_preinit(&argc, &argv); pthread_create(&playback_thread_id, NULL, playback_thread, &ctx); - [_eventsResponder.input_ready lock]; - while (!_eventsResponder.inputContext) - [_eventsResponder.input_ready wait]; - [_eventsResponder.input_ready unlock]; + [[EventsResponder sharedInstance] waitForInputContext]; cocoa_run_runloop(); @@ -378,10 +375,7 @@ void cocoa_stop_runloop(void) void cocoa_set_input_context(struct input_ctx *input_context) { - [_eventsResponder.input_ready lock]; - _eventsResponder.inputContext = input_context; - [_eventsResponder.input_ready signal]; - [_eventsResponder.input_ready unlock]; + [EventsResponder sharedInstance].inputContext = input_context; } void cocoa_post_fake_event(void) -- cgit v1.2.3