Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
64de31cb
Commit
64de31cb
authored
Oct 16, 2012
by
Felix Paul Kühne
Committed by
Felix Paul Kühne
Oct 16, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: fixed compilation for llvm-gcc-4.2
parent
97120924
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
6 deletions
+13
-6
modules/gui/macosx/StringUtility.m
modules/gui/macosx/StringUtility.m
+4
-0
modules/gui/macosx/VLCVoutWindowController.m
modules/gui/macosx/VLCVoutWindowController.m
+9
-6
No files found.
modules/gui/macosx/StringUtility.m
View file @
64de31cb
...
...
@@ -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
;
}
...
...
modules/gui/macosx/VLCVoutWindowController.m
View file @
64de31cb
...
...
@@ -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
);
}];
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment