Commit a2ef7dad authored by David Fuhrmann's avatar David Fuhrmann

macosx: remove unneeded p_vouts in videoview

(cherry picked from commit a2347e5728d0c6749172f43ce40387338224103e)
Signed-off-by: default avatarDavid Fuhrmann <david.fuhrmann@googlemail.com>
parent 127ffb40
...@@ -189,26 +189,20 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, ...@@ -189,26 +189,20 @@ 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( ( [o_event type] == NSLeftMouseDown ) &&
if( p_vout ) ( ! ( [o_event modifierFlags] & NSControlKeyMask ) ) )
{ {
if( ( [o_event type] == NSLeftMouseDown ) && if( [o_event clickCount] > 1 )
( ! ( [o_event modifierFlags] & NSControlKeyMask ) ) )
{
if( [o_event clickCount] > 1 )
{
/* multiple clicking */
[[VLCCoreInteraction sharedInstance] toggleFullscreen];
}
}
else if( ( [o_event type] == NSRightMouseDown ) ||
( ( [o_event type] == NSLeftMouseDown ) &&
( [o_event modifierFlags] & NSControlKeyMask ) ) )
{ {
msg_Dbg( p_vout, "received NSRightMouseDown (generic method) or Ctrl clic" ); /* multiple clicking */
[NSMenu popUpContextMenu: [[VLCMainMenu sharedInstance] voutMenu] withEvent: o_event forView: self]; [[VLCCoreInteraction sharedInstance] toggleFullscreen];
} }
vlc_object_release( p_vout ); }
else if( ( [o_event type] == NSRightMouseDown ) ||
( ( [o_event type] == NSLeftMouseDown ) &&
( [o_event modifierFlags] & NSControlKeyMask ) ) )
{
[NSMenu popUpContextMenu: [[VLCMainMenu sharedInstance] voutMenu] withEvent: o_event forView: self];
} }
[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 )
{ [NSMenu popUpContextMenu: [[VLCMainMenu sharedInstance] voutMenu] withEvent: o_event forView: self];
vout_thread_t * p_vout = getVout();
if (p_vout)
[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 )
{ [NSMenu popUpContextMenu: [[VLCMainMenu sharedInstance] voutMenu] withEvent: o_event forView: self];
vout_thread_t * p_vout = getVout();
if (p_vout)
{
[NSMenu popUpContextMenu: [[VLCMainMenu sharedInstance] voutMenu] withEvent: o_event forView: self];
vlc_object_release( p_vout );
}
}
[super mouseUp: o_event]; [super mouseUp: o_event];
} }
......
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