Commit 9ac6fec0 authored by Felix Paul Kühne's avatar Felix Paul Kühne

macosx: renamed getVoutView to voutView in order to make it conform to the cocoa naming scheme

parent d4b55453
...@@ -15,6 +15,9 @@ Stream output: ...@@ -15,6 +15,9 @@ Stream output:
* Multiple bridge-in instances are now possible. * Multiple bridge-in instances are now possible.
* bridge-in can be used to configure a placeholder stream. * bridge-in can be used to configure a placeholder stream.
Mac OS X Interface:
* Reveal-in-Finder functionality for locally stored items
Changes between 0.9.2 and 0.9.3: Changes between 0.9.2 and 0.9.3:
-------------------------------- --------------------------------
......
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
} }
- (void)controlTintChanged; - (void)controlTintChanged;
- (id)getVoutView; - (id)voutView;
- (IBAction)play:(id)sender; - (IBAction)play:(id)sender;
- (IBAction)stop:(id)sender; - (IBAction)stop:(id)sender;
......
...@@ -158,9 +158,7 @@ ...@@ -158,9 +158,7 @@
var_SetInteger( p_intf->p_libvlc, "key-action", ACTIONID_PLAY_PAUSE ); var_SetInteger( p_intf->p_libvlc, "key-action", ACTIONID_PLAY_PAUSE );
} }
/* FIXME: I want to be Private */ - (id)voutView
- (id)getVoutView
{ {
id window; id window;
id voutView = nil; id voutView = nil;
...@@ -176,8 +174,8 @@ ...@@ -176,8 +174,8 @@
/* We have a detached vout */ /* We have a detached vout */
else if( [[window className] isEqualToString: @"VLCVoutWindow"] ) else if( [[window className] isEqualToString: @"VLCVoutWindow"] )
{ {
msg_Dbg( VLCIntf, "detached vout controls.m call getVoutView" ); msg_Dbg( VLCIntf, "detached vout controls.m call voutView" );
voutView = [window getVoutView]; voutView = [window voutView];
} }
} }
return [[voutView retain] autorelease]; return [[voutView retain] autorelease];
...@@ -189,7 +187,7 @@ ...@@ -189,7 +187,7 @@
var_SetInteger( p_intf->p_libvlc, "key-action", ACTIONID_STOP ); var_SetInteger( p_intf->p_libvlc, "key-action", ACTIONID_STOP );
/* Close the window directly, because we do know that there /* Close the window directly, because we do know that there
* won't be anymore video. It's currently waiting a bit. */ * won't be anymore video. It's currently waiting a bit. */
[[[self _voutView] window] orderOut:self]; [[[self voutView] window] orderOut:self];
} }
- (IBAction)faster:(id)sender - (IBAction)faster:(id)sender
......
...@@ -368,7 +368,7 @@ ...@@ -368,7 +368,7 @@
- (void)hasBecomeFullscreen - (void)hasBecomeFullscreen
{ {
[o_fullscreen_window makeFirstResponder: [[[VLCMain sharedInstance] getControls] getVoutView]]; [o_fullscreen_window makeFirstResponder: [[[VLCMain sharedInstance] getControls] voutView]];
[o_fullscreen_window makeKeyWindow]; [o_fullscreen_window makeKeyWindow];
[o_fullscreen_window setAcceptsMouseMovedEvents: TRUE]; [o_fullscreen_window setAcceptsMouseMovedEvents: TRUE];
......
...@@ -178,7 +178,7 @@ ...@@ -178,7 +178,7 @@
- (void)setActive:(id)noData - (void)setActive:(id)noData
{ {
if( [[[[VLCMain sharedInstance] getControls] getVoutView] isFullscreen] ) if( [[[[VLCMain sharedInstance] getControls] voutView] isFullscreen] )
{ {
b_nonActive = NO; b_nonActive = NO;
[self fadeIn]; [self fadeIn];
...@@ -244,8 +244,8 @@ ...@@ -244,8 +244,8 @@
- (void)mouseExited:(NSEvent *)theEvent - (void)mouseExited:(NSEvent *)theEvent
{ {
/* give up our focus, so the vout may show us again without letting the user clicking it */ /* give up our focus, so the vout may show us again without letting the user clicking it */
if( [[[[VLCMain sharedInstance] getControls] getVoutView] isFullscreen] ) if( [[[[VLCMain sharedInstance] getControls] voutView] isFullscreen] )
[[[[[VLCMain sharedInstance] getControls] getVoutView] window] makeKeyWindow]; [[[[[VLCMain sharedInstance] getControls] voutView] window] makeKeyWindow];
} }
- (void)hideMouse - (void)hideMouse
......
...@@ -1599,7 +1599,7 @@ static void * manage_cleanup( void * args ) ...@@ -1599,7 +1599,7 @@ static void * manage_cleanup( void * args )
[self setScrollField: aString stopAfter:-1]; [self setScrollField: aString stopAfter:-1];
[[[self getControls] getFSPanel] setStreamTitle: aString]; [[[self getControls] getFSPanel] setStreamTitle: aString];
[[o_controls getVoutView] updateTitle]; [[o_controls voutView] updateTitle];
[o_playlist updateRowSelection]; [o_playlist updateRowSelection];
p_intf->p_sys->b_current_title_update = FALSE; p_intf->p_sys->b_current_title_update = FALSE;
......
...@@ -87,7 +87,7 @@ create_toolbar_item( NSString * o_itemIdent, NSString * o_name, NSString * o_des ...@@ -87,7 +87,7 @@ create_toolbar_item( NSString * o_itemIdent, NSString * o_name, NSString * o_des
return o_toolbarItem; return o_toolbarItem;
} }
- (NSToolbarItem *) toolbar: (NSToolbar *)o_sprefs_toolbar - (NSToolbarItem *) toolbar: (NSToolbar *)o_vlm_toolbar
itemForItemIdentifier: (NSString *)o_itemIdent itemForItemIdentifier: (NSString *)o_itemIdent
willBeInsertedIntoToolbar: (BOOL)b_willBeInserted willBeInsertedIntoToolbar: (BOOL)b_willBeInserted
{ {
......
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
- (void)snapshot; - (void)snapshot;
- (id)getWindow; - (id)getWindow;
+ (id)getVoutView: (vout_thread_t *)p_vout subView: (NSView *) view + (id)voutView: (vout_thread_t *)p_vout subView: (NSView *) view
frame: (NSRect *) s_frame; frame: (NSRect *) s_frame;
+ (vout_thread_t *)getRealVout: (vout_thread_t *)p_vout; + (vout_thread_t *)getRealVout: (vout_thread_t *)p_vout;
...@@ -127,5 +127,5 @@ ...@@ -127,5 +127,5 @@
- (id)initMainThread: (id) sender; - (id)initMainThread: (id) sender;
- (void)leaveFullscreen; - (void)leaveFullscreen;
- (void)enterFullscreen; - (void)enterFullscreen;
- (id)getVoutView; - (id)voutView;
@end @end
...@@ -532,7 +532,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, ...@@ -532,7 +532,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
( [o_event modifierFlags] & NSControlKeyMask ) ) ) ( [o_event modifierFlags] & NSControlKeyMask ) ) )
{ {
msg_Dbg( p_vout, "received NSRightMouseDown (generic method) or Ctrl clic" ); msg_Dbg( p_vout, "received NSRightMouseDown (generic method) or Ctrl clic" );
[NSMenu popUpContextMenu: [[VLCMain sharedInstance] getVoutMenu] withEvent: o_event forView: [[[VLCMain sharedInstance] getControls] getVoutView]]; [NSMenu popUpContextMenu: [[VLCMain sharedInstance] getVoutMenu] withEvent: o_event forView: [[[VLCMain sharedInstance] getControls] voutView]];
} }
} }
...@@ -558,7 +558,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, ...@@ -558,7 +558,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
if( p_vout && [o_event type] == NSRightMouseDown ) if( p_vout && [o_event type] == NSRightMouseDown )
{ {
msg_Dbg( p_vout, "received NSRightMouseDown (specific method)" ); msg_Dbg( p_vout, "received NSRightMouseDown (specific method)" );
[NSMenu popUpContextMenu: [[VLCMain sharedInstance] getVoutMenu] withEvent: o_event forView: [[[VLCMain sharedInstance] getControls] getVoutView]]; [NSMenu popUpContextMenu: [[VLCMain sharedInstance] getVoutMenu] withEvent: o_event forView: [[[VLCMain sharedInstance] getControls] voutView]];
} }
[super mouseDown: o_event]; [super mouseDown: o_event];
...@@ -603,7 +603,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, ...@@ -603,7 +603,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
/* FIXME: this isn't the appropriate place, but we can't receive /* FIXME: this isn't the appropriate place, but we can't receive
* NSRightMouseDown some how */ * NSRightMouseDown some how */
msg_Dbg( p_vout, "received NSRightMouseUp" ); msg_Dbg( p_vout, "received NSRightMouseUp" );
[NSMenu popUpContextMenu: [[VLCMain sharedInstance] getVoutMenu] withEvent: o_event forView: [[[VLCMain sharedInstance] getControls] getVoutView]]; [NSMenu popUpContextMenu: [[VLCMain sharedInstance] getVoutMenu] withEvent: o_event forView: [[[VLCMain sharedInstance] getControls] voutView]];
} }
[super mouseUp: o_event]; [super mouseUp: o_event];
...@@ -701,7 +701,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, ...@@ -701,7 +701,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
return (vout_thread_t *) p_vout->p_parent; return (vout_thread_t *) p_vout->p_parent;
} }
+ (id)getVoutView: (vout_thread_t *)p_vout subView: (NSView *)view + (id)voutView: (vout_thread_t *)p_vout subView: (NSView *)view
frame: (NSRect *)s_frame frame: (NSRect *)s_frame
{ {
vlc_value_t value_drawable; vlc_value_t value_drawable;
...@@ -1139,7 +1139,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, ...@@ -1139,7 +1139,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
[self setLevel: NSStatusWindowLevel]; [self setLevel: NSStatusWindowLevel];
} }
- (id)getVoutView // FIXME Naming scheme! - (id)voutView
{ {
return o_view; return o_view;
} }
......
...@@ -320,7 +320,7 @@ static void Unlock( vout_thread_t * p_vout ) ...@@ -320,7 +320,7 @@ static void Unlock( vout_thread_t * p_vout )
/* Spawn the window */ /* Spawn the window */
id old_vout = p_vout->p_sys->o_vout_view; id old_vout = p_vout->p_sys->o_vout_view;
p_vout->p_sys->o_vout_view = [[VLCVoutView getVoutView: p_vout p_vout->p_sys->o_vout_view = [[VLCVoutView voutView: p_vout
subView: p_vout->p_sys->o_glview frame: nil] retain]; subView: p_vout->p_sys->o_glview frame: nil] retain];
[old_vout release]; [old_vout release];
} }
...@@ -348,7 +348,7 @@ static void Unlock( vout_thread_t * p_vout ) ...@@ -348,7 +348,7 @@ static void Unlock( vout_thread_t * p_vout )
if( p_vout->p_sys->b_saved_frame ) if( p_vout->p_sys->b_saved_frame )
{ {
id old_vout = p_vout->p_sys->o_vout_view; id old_vout = p_vout->p_sys->o_vout_view;
p_vout->p_sys->o_vout_view = [[VLCVoutView getVoutView: p_vout p_vout->p_sys->o_vout_view = [[VLCVoutView voutView: p_vout
subView: o_glview subView: o_glview
frame: &p_vout->p_sys->s_frame] retain]; frame: &p_vout->p_sys->s_frame] retain];
[old_vout release]; [old_vout release];
...@@ -356,7 +356,7 @@ static void Unlock( vout_thread_t * p_vout ) ...@@ -356,7 +356,7 @@ static void Unlock( vout_thread_t * p_vout )
else else
{ {
id old_vout = p_vout->p_sys->o_vout_view; id old_vout = p_vout->p_sys->o_vout_view;
p_vout->p_sys->o_vout_view = [[VLCVoutView getVoutView: p_vout p_vout->p_sys->o_vout_view = [[VLCVoutView voutView: p_vout
subView: o_glview frame: nil] retain]; subView: o_glview frame: nil] retain];
[old_vout release]; [old_vout release];
} }
......
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