Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
c8961ccb
Commit
c8961ccb
authored
Aug 13, 2015
by
David Fuhrmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: fix some compiler warnings / deprecated methods
parent
935361b0
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
14 additions
and
24 deletions
+14
-24
modules/gui/macosx/AppleRemote.h
modules/gui/macosx/AppleRemote.h
+1
-1
modules/gui/macosx/AppleRemote.m
modules/gui/macosx/AppleRemote.m
+2
-2
modules/gui/macosx/PXSourceList.m
modules/gui/macosx/PXSourceList.m
+5
-15
modules/gui/macosx/VLCVoutWindowController.m
modules/gui/macosx/VLCVoutWindowController.m
+2
-2
modules/gui/macosx/Windows.m
modules/gui/macosx/Windows.m
+2
-2
modules/gui/macosx/misc.m
modules/gui/macosx/misc.m
+1
-1
modules/gui/macosx/prefs_widgets.m
modules/gui/macosx/prefs_widgets.m
+1
-1
No files found.
modules/gui/macosx/AppleRemote.h
View file @
c8961ccb
...
...
@@ -179,7 +179,7 @@ The class is not thread safe
/* A NSApplication delegate which is used to activate and deactivate listening to the remote control
* dependent on the activation state of your application.
* All events are delegated to the original NSApplication delegate if necessary */
@interface
AppleRemoteApplicationDelegate
:
NSObject
{
@interface
AppleRemoteApplicationDelegate
:
NSObject
<
NSApplicationDelegate
>
{
id
applicationDelegate
;
}
...
...
modules/gui/macosx/AppleRemote.m
View file @
c8961ccb
...
...
@@ -162,12 +162,12 @@ const NSTimeInterval HOLD_RECOGNITION_TIME_INTERVAL=0.4;
if
([
self
listeningOnAppActivate
])
return
;
AppleRemoteApplicationDelegate
*
appDelegate
=
[[
AppleRemoteApplicationDelegate
alloc
]
initWithApplicationDelegate
:
[
NSApp
delegate
]];
/* NSApp does not retain its delegate therefore we keep retain count on 1 */
[
NSApp
setDelegate
:
appDelegate
];
[
(
NSApplication
*
)
NSApp
setDelegate
:
appDelegate
];
}
else
{
if
([
self
listeningOnAppActivate
]
==
NO
)
return
;
AppleRemoteApplicationDelegate
*
appDelegate
=
(
AppleRemoteApplicationDelegate
*
)[
NSApp
delegate
];
id
previousAppDelegate
=
[
appDelegate
applicationDelegate
];
[
NSApp
setDelegate
:
previousAppDelegate
];
[
(
NSApplication
*
)
NSApp
setDelegate
:
previousAppDelegate
];
}
}
...
...
modules/gui/macosx/PXSourceList.m
View file @
c8961ccb
...
...
@@ -378,21 +378,11 @@ NSString * const PXSLDeleteKeyPressedOnRowsNotification = @"PXSourceListDeleteKe
iconRect
=
NSMakeRect
(
NSMidX
(
iconRect
)
-
(
actualIconSize
.
width
/
2
.
0
f
),
NSMidY
(
iconRect
)
-
(
actualIconSize
.
height
/
2
.
0
f
),
actualIconSize
.
width
,
actualIconSize
.
height
);
}
//Use 10.6 NSImage drawing if we can
if
(
NSAppKitVersionNumber
>=
1115
.
2
)
{
// Lion
[
icon
drawInRect
:
iconRect
fromRect:
NSZeroRect
operation:
NSCompositeSourceOver
fraction:
1
respectFlipped:
YES
hints
:
nil
];
}
else
{
[
icon
setFlipped
:[
self
isFlipped
]];
[
icon
drawInRect
:
iconRect
fromRect:
NSZeroRect
operation:
NSCompositeSourceOver
fraction:
1
];
}
[
icon
drawInRect
:
iconRect
fromRect:
NSZeroRect
operation:
NSCompositeSourceOver
fraction:
1
respectFlipped:
YES
hints
:
nil
];
}
}
}
...
...
modules/gui/macosx/VLCVoutWindowController.m
View file @
c8961ccb
...
...
@@ -356,8 +356,8 @@ void WindowClose(vout_window_t *p_wnd)
if
([
o_vout_dict
count
]
==
1
)
{
NSWindow
*
o_first_window
=
[
o_vout_dict
objectForKey
:
[[
o_vout_dict
allKeys
]
firstObject
]];
NS
Point
topleftbase
=
NSMakePoint
(
0
,
[
o_first_window
frame
].
size
.
height
);
top_left_point
=
[
o_first_window
convert
BaseToScreen
:
topleftbase
]
;
NS
Rect
topleftBaseRect
=
NSMakeRect
(
0
,
[
o_first_window
frame
].
size
.
height
,
0
,
0
);
top_left_point
=
[
o_first_window
convert
RectToScreen
:
topleftBaseRect
].
origin
;
}
top_left_point
=
[
o_new_video_window
cascadeTopLeftFromPoint
:
top_left_point
];
...
...
modules/gui/macosx/Windows.m
View file @
c8961ccb
...
...
@@ -513,8 +513,8 @@
NSSize
windowMinSize
=
[
self
minSize
];
NSRect
screenFrame
=
[[
self
screen
]
visibleFrame
];
NS
Point
topleftbase
=
NSMakePoint
(
0
,
[
self
frame
].
size
.
height
);
NSPoint
topleftscreen
=
[
self
convert
BaseToScreen
:
topleftbase
]
;
NS
Rect
topleftbase
=
NSMakeRect
(
0
,
[
self
frame
].
size
.
height
,
0
,
0
);
NSPoint
topleftscreen
=
[
self
convert
RectToScreen
:
topleftbase
].
origin
;
CGFloat
f_width
=
size
.
width
;
CGFloat
f_height
=
size
.
height
;
...
...
modules/gui/macosx/misc.m
View file @
c8961ccb
...
...
@@ -407,7 +407,7 @@ static bool b_old_spaces_style = YES;
NSRect
frameRect
=
[
self
bounds
];
[[
NSColor
selectedControlColor
]
set
];
NSFrameRectWithWidthUsingOperation
(
frameRect
,
2
.,
NSComposite
Highlight
);
NSFrameRectWithWidthUsingOperation
(
frameRect
,
2
.,
NSComposite
SourceOver
);
}
[
super
drawRect
:
dirtyRect
];
...
...
modules/gui/macosx/prefs_widgets.m
View file @
c8961ccb
...
...
@@ -2221,7 +2221,7 @@ o_moduleenabled = [NSNumber numberWithBool:NO];\
// We don't ever want to drop onto a row, only between rows.
if
(
op
==
NSTableViewDropOn
)
[
table
setDropRow
:(
row
+
1
)
dropOperation
:
NSTableViewDropAbove
];
return
NS
TableViewDropAbove
;
return
NS
DragOperationGeneric
;
}
-
(
BOOL
)
tableView
:(
NSTableView
*
)
table
acceptDrop
:(
id
<
NSDraggingInfo
>
)
info
...
...
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