From 11dad6d44b7e969f32f00379cea514101a46a0ac Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Tue, 13 Aug 2013 14:52:49 +0200 Subject: macosx: remove platform specific input queue Since last commit the input queue in the core is thread safe, so there is no need for all this platform specific stuff anymore. --- osdep/macosx_application.m | 43 ------------------------------------------- 1 file changed, 43 deletions(-) (limited to 'osdep/macosx_application.m') diff --git a/osdep/macosx_application.m b/osdep/macosx_application.m index d04b2ccdea..e561d54c13 100644 --- a/osdep/macosx_application.m +++ b/osdep/macosx_application.m @@ -47,47 +47,6 @@ static pthread_t playback_thread_id; - (void)setAppleMenu:(NSMenu *)aMenu; @end -@implementation InputQueue { - NSMutableArray *_fifo; -} - -- (id)init -{ - if (self = [super init]) { - self->_fifo = [[NSMutableArray alloc] init]; - } - - return self; -} - -- (void)push:(int)keycode -{ - @synchronized (_fifo) { - [_fifo addObject:[NSNumber numberWithInt:keycode]]; - } -} - -- (int)pop -{ - int r = -1; - - @synchronized (_fifo) { - if ([_fifo count] > 0) { - r = [[_fifo objectAtIndex:0] intValue]; - [_fifo removeObjectAtIndex:0]; - } - } - - return r; -} - -- (void)dealloc -{ - [self->_fifo release]; - [super dealloc]; -} -@end - Application *mpv_shared_app(void) { return (Application *)[Application sharedApplication]; @@ -114,7 +73,6 @@ static NSString *escape_loadfile_name(NSString *input) @synthesize willStopOnOpenEvent = _will_stop_on_open_event; @synthesize inputContext = _input_context; -@synthesize iqueue = _iqueue; @synthesize eventsResponder = _events_responder; @synthesize menuItems = _menu_items; @@ -132,7 +90,6 @@ static NSString *escape_loadfile_name(NSString *input) self.menuItems = [[[NSMutableDictionary alloc] init] autorelease]; self.files = nil; self.argumentsList = [[[NSMutableArray alloc] init] autorelease]; - self.iqueue = [[[InputQueue alloc] init] autorelease]; self.eventsResponder = [[[EventsResponder alloc] init] autorelease]; self.willStopOnOpenEvent = NO; -- cgit v1.2.3