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
a2347e57
Commit
a2347e57
authored
May 06, 2012
by
David Fuhrmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: remove unneeded p_vouts in videoview
parent
2aa0ad9c
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
31 deletions
+13
-31
modules/gui/macosx/VideoView.m
modules/gui/macosx/VideoView.m
+13
-31
No files found.
modules/gui/macosx/VideoView.m
View file @
a2347e57
...
@@ -189,9 +189,6 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
...
@@ -189,9 +189,6 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
-
(
void
)
mouseDown
:(
NSEvent
*
)
o_event
-
(
void
)
mouseDown
:(
NSEvent
*
)
o_event
{
{
vout_thread_t
*
p_vout
=
getVout
();
if
(
p_vout
)
{
if
(
(
[
o_event
type
]
==
NSLeftMouseDown
)
&&
if
(
(
[
o_event
type
]
==
NSLeftMouseDown
)
&&
(
!
(
[
o_event
modifierFlags
]
&
NSControlKeyMask
)
)
)
(
!
(
[
o_event
modifierFlags
]
&
NSControlKeyMask
)
)
)
{
{
...
@@ -205,11 +202,8 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
...
@@ -205,11 +202,8 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
(
(
[
o_event
type
]
==
NSLeftMouseDown
)
&&
(
(
[
o_event
type
]
==
NSLeftMouseDown
)
&&
(
[
o_event
modifierFlags
]
&
NSControlKeyMask
)
)
)
(
[
o_event
modifierFlags
]
&
NSControlKeyMask
)
)
)
{
{
msg_Dbg
(
p_vout
,
"received NSRightMouseDown (generic method) or Ctrl clic"
);
[
NSMenu
popUpContextMenu
:
[[
VLCMainMenu
sharedInstance
]
voutMenu
]
withEvent
:
o_event
forView
:
self
];
[
NSMenu
popUpContextMenu
:
[[
VLCMainMenu
sharedInstance
]
voutMenu
]
withEvent
:
o_event
forView
:
self
];
}
}
vlc_object_release
(
p_vout
);
}
[
super
mouseDown
:
o_event
];
[
super
mouseDown
:
o_event
];
}
}
...
@@ -217,12 +211,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
...
@@ -217,12 +211,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
-
(
void
)
rightMouseDown
:(
NSEvent
*
)
o_event
-
(
void
)
rightMouseDown
:(
NSEvent
*
)
o_event
{
{
if
(
[
o_event
type
]
==
NSRightMouseDown
)
if
(
[
o_event
type
]
==
NSRightMouseDown
)
{
vout_thread_t
*
p_vout
=
getVout
();
if
(
p_vout
)
[
NSMenu
popUpContextMenu
:
[[
VLCMainMenu
sharedInstance
]
voutMenu
]
withEvent
:
o_event
forView
:
self
];
[
NSMenu
popUpContextMenu
:
[[
VLCMainMenu
sharedInstance
]
voutMenu
]
withEvent
:
o_event
forView
:
self
];
vlc_object_release
(
p_vout
);
}
[
super
mouseDown
:
o_event
];
[
super
mouseDown
:
o_event
];
}
}
...
@@ -230,14 +219,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
...
@@ -230,14 +219,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
-
(
void
)
rightMouseUp
:(
NSEvent
*
)
o_event
-
(
void
)
rightMouseUp
:(
NSEvent
*
)
o_event
{
{
if
(
[
o_event
type
]
==
NSRightMouseUp
)
if
(
[
o_event
type
]
==
NSRightMouseUp
)
{
vout_thread_t
*
p_vout
=
getVout
();
if
(
p_vout
)
{
[
NSMenu
popUpContextMenu
:
[[
VLCMainMenu
sharedInstance
]
voutMenu
]
withEvent
:
o_event
forView
:
self
];
[
NSMenu
popUpContextMenu
:
[[
VLCMainMenu
sharedInstance
]
voutMenu
]
withEvent
:
o_event
forView
:
self
];
vlc_object_release
(
p_vout
);
}
}
[
super
mouseUp
:
o_event
];
[
super
mouseUp
:
o_event
];
}
}
...
...
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