Commit 64de31cb authored by Felix Paul Kühne's avatar Felix Paul Kühne Committed by Felix Paul Kühne

macosx: fixed compilation for llvm-gcc-4.2

parent 97120924
......@@ -280,7 +280,9 @@ unsigned int CocoaKeyToVLC(unichar i_key)
theString = [theString stringByReplacingOccurrencesOfString:@"Ctrl" withString:@""];
}
#ifdef __clang__
#pragma GCC diagnostic ignored "-Wformat"
#endif
if ([theString length] > 1) {
if ([theString rangeOfString:@"Up"].location != NSNotFound)
return [NSString stringWithFormat:@"%C", NSUpArrowFunctionKey];
......@@ -336,7 +338,9 @@ unsigned int CocoaKeyToVLC(unichar i_key)
return [NSString stringWithFormat:@"%C", NSF1FunctionKey];
/* note that we don't support esc here, since it is reserved for leaving fullscreen */
}
#ifdef __clang__
#pragma GCC diagnostic warning "-Wformat"
#endif
return theString;
}
......
......@@ -66,10 +66,12 @@
- (void)updateWindowsControlsBarWithSelector:(SEL)aSel
{
[o_vout_dict enumerateKeysAndObjectsUsingBlock:^(id key, VLCVideoWindowCommon *o_window, BOOL *stop) {
id o_controlsBar = [o_window controlsBar];
if (o_controlsBar)
[o_controlsBar performSelector:aSel];
[o_vout_dict enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
if ([obj respondsToSelector:@selector(controlsBar)]) {
id o_controlsBar = [obj controlsBar];
if (o_controlsBar)
[o_controlsBar performSelector:aSel];
}
}];
}
......@@ -86,8 +88,9 @@
- (void)updateWindowsUsingBlock:(void (^)(VLCVideoWindowCommon *o_window))windowUpdater
{
[o_vout_dict enumerateKeysAndObjectsUsingBlock:^(id key, VLCVideoWindowCommon *o_window, BOOL *stop) {
windowUpdater(o_window);
[o_vout_dict enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
if ([obj isKindOfClass: [NSWindow class]])
windowUpdater(obj);
}];
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment