summaryrefslogtreecommitdiffstats
path: root/osdep/macosx_events.m
diff options
context:
space:
mode:
authorStefano Pigozzi <stefano.pigozzi@gmail.com>2014-12-06 12:48:18 +0100
committerStefano Pigozzi <stefano.pigozzi@gmail.com>2014-12-06 14:16:13 +0100
commit685b8b7a00ad171f76aba6a93ffaff890aa0caa1 (patch)
tree473989c55d4e364867ed264cd171fd19ac7be5ad /osdep/macosx_events.m
parent429fe85c4827035cab5dea163e427630d8b4f93f (diff)
downloadmpv-685b8b7a00ad171f76aba6a93ffaff890aa0caa1.tar.bz2
mpv-685b8b7a00ad171f76aba6a93ffaff890aa0caa1.tar.xz
cocoa: use --idle when running inside bundle
Previously when using the bundle we used a custom bizarro thing to wait for events. Just use `--idle` and greatly simplify the code.
Diffstat (limited to 'osdep/macosx_events.m')
-rw-r--r--osdep/macosx_events.m10
1 files changed, 5 insertions, 5 deletions
diff --git a/osdep/macosx_events.m b/osdep/macosx_events.m
index fcbfd46042..026f3777d1 100644
--- a/osdep/macosx_events.m
+++ b/osdep/macosx_events.m
@@ -439,11 +439,11 @@ void cocoa_set_input_context(struct input_ctx *input_context)
{
size_t num_files = [files count];
char **files_utf8 = talloc_array(NULL, char*, num_files);
- [files enumerateObjectsUsingBlock:^(id obj, NSUInteger i, BOOL *_){
- NSURL *url = [NSURL URLWithString:obj];
- NSString *path = [url path];
- char *filename = (char *)[path UTF8String];
- size_t bytes = [path lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
+ [files enumerateObjectsUsingBlock:^(NSString *p, NSUInteger i, BOOL *_){
+ if ([p hasPrefix:@"file:///.file/id="])
+ p = [[NSURL URLWithString:p] path];
+ char *filename = (char *)[p UTF8String];
+ size_t bytes = [p lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
files_utf8[i] = talloc_memdup(files_utf8, filename, bytes + 1);
}];
mp_event_drop_files(_inputContext, num_files, files_utf8);