[vlc-devel] commit: macosx: renamed getVoutView to voutView in order to make it conform to the cocoa naming scheme ( Felix Paul Kühne )
git version control
git at videolan.org
Fri Oct 3 16:44:33 CEST 2008
vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Fri Oct 3 16:44:26 2008 +0200| [9ac6fec0593429dfb7a4cf25698b874ebc045be2] | committer: Felix Paul Kühne
macosx: renamed getVoutView to voutView in order to make it conform to the cocoa naming scheme
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9ac6fec0593429dfb7a4cf25698b874ebc045be2
---
NEWS | 3 +++
modules/gui/macosx/controls.h | 2 +-
modules/gui/macosx/controls.m | 10 ++++------
modules/gui/macosx/embeddedwindow.m | 2 +-
modules/gui/macosx/fspanel.m | 6 +++---
modules/gui/macosx/intf.m | 2 +-
modules/gui/macosx/vlm.m | 2 +-
modules/gui/macosx/vout.h | 6 +++---
modules/gui/macosx/vout.m | 12 ++++++------
modules/gui/macosx/voutgl.m | 14 +++++++-------
10 files changed, 30 insertions(+), 29 deletions(-)
diff --git a/NEWS b/NEWS
index cf6fdeb..5e3c70f 100644
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,9 @@ Stream output:
* Multiple bridge-in instances are now possible.
* 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:
--------------------------------
diff --git a/modules/gui/macosx/controls.h b/modules/gui/macosx/controls.h
index 9161a2a..4fbbd69 100644
--- a/modules/gui/macosx/controls.h
+++ b/modules/gui/macosx/controls.h
@@ -56,7 +56,7 @@
}
- (void)controlTintChanged;
-- (id)getVoutView;
+- (id)voutView;
- (IBAction)play:(id)sender;
- (IBAction)stop:(id)sender;
diff --git a/modules/gui/macosx/controls.m b/modules/gui/macosx/controls.m
index b6ccf0a..3eaadf9 100644
--- a/modules/gui/macosx/controls.m
+++ b/modules/gui/macosx/controls.m
@@ -158,9 +158,7 @@
var_SetInteger( p_intf->p_libvlc, "key-action", ACTIONID_PLAY_PAUSE );
}
-/* FIXME: I want to be Private */
-
-- (id)getVoutView
+- (id)voutView
{
id window;
id voutView = nil;
@@ -176,8 +174,8 @@
/* We have a detached vout */
else if( [[window className] isEqualToString: @"VLCVoutWindow"] )
{
- msg_Dbg( VLCIntf, "detached vout controls.m call getVoutView" );
- voutView = [window getVoutView];
+ msg_Dbg( VLCIntf, "detached vout controls.m call voutView" );
+ voutView = [window voutView];
}
}
return [[voutView retain] autorelease];
@@ -189,7 +187,7 @@
var_SetInteger( p_intf->p_libvlc, "key-action", ACTIONID_STOP );
/* Close the window directly, because we do know that there
* 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
diff --git a/modules/gui/macosx/embeddedwindow.m b/modules/gui/macosx/embeddedwindow.m
index 4b2cea4..540cbfc 100644
--- a/modules/gui/macosx/embeddedwindow.m
+++ b/modules/gui/macosx/embeddedwindow.m
@@ -368,7 +368,7 @@
- (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 setAcceptsMouseMovedEvents: TRUE];
diff --git a/modules/gui/macosx/fspanel.m b/modules/gui/macosx/fspanel.m
index d3ceab1..5fabdfe 100644
--- a/modules/gui/macosx/fspanel.m
+++ b/modules/gui/macosx/fspanel.m
@@ -178,7 +178,7 @@
- (void)setActive:(id)noData
{
- if( [[[[VLCMain sharedInstance] getControls] getVoutView] isFullscreen] )
+ if( [[[[VLCMain sharedInstance] getControls] voutView] isFullscreen] )
{
b_nonActive = NO;
[self fadeIn];
@@ -244,8 +244,8 @@
- (void)mouseExited:(NSEvent *)theEvent
{
/* give up our focus, so the vout may show us again without letting the user clicking it */
- if( [[[[VLCMain sharedInstance] getControls] getVoutView] isFullscreen] )
- [[[[[VLCMain sharedInstance] getControls] getVoutView] window] makeKeyWindow];
+ if( [[[[VLCMain sharedInstance] getControls] voutView] isFullscreen] )
+ [[[[[VLCMain sharedInstance] getControls] voutView] window] makeKeyWindow];
}
- (void)hideMouse
diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 75a346c..4785786 100644
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -1599,7 +1599,7 @@ static void * manage_cleanup( void * args )
[self setScrollField: aString stopAfter:-1];
[[[self getControls] getFSPanel] setStreamTitle: aString];
- [[o_controls getVoutView] updateTitle];
+ [[o_controls voutView] updateTitle];
[o_playlist updateRowSelection];
p_intf->p_sys->b_current_title_update = FALSE;
diff --git a/modules/gui/macosx/vlm.m b/modules/gui/macosx/vlm.m
index de8cde6..c66beb0 100644
--- a/modules/gui/macosx/vlm.m
+++ b/modules/gui/macosx/vlm.m
@@ -87,7 +87,7 @@ create_toolbar_item( NSString * o_itemIdent, NSString * o_name, NSString * o_des
return o_toolbarItem;
}
-- (NSToolbarItem *) toolbar: (NSToolbar *)o_sprefs_toolbar
+- (NSToolbarItem *) toolbar: (NSToolbar *)o_vlm_toolbar
itemForItemIdentifier: (NSString *)o_itemIdent
willBeInsertedIntoToolbar: (BOOL)b_willBeInserted
{
diff --git a/modules/gui/macosx/vout.h b/modules/gui/macosx/vout.h
index 314fba0..3a35d11 100644
--- a/modules/gui/macosx/vout.h
+++ b/modules/gui/macosx/vout.h
@@ -72,8 +72,8 @@
- (void)snapshot;
- (id)getWindow;
-+ (id)getVoutView: (vout_thread_t *)p_vout subView: (NSView *) view
- frame: (NSRect *) s_frame;
++ (id)voutView: (vout_thread_t *)p_vout subView: (NSView *) view
+ frame: (NSRect *) s_frame;
+ (vout_thread_t *)getRealVout: (vout_thread_t *)p_vout;
- (void)enterFullscreen;
@@ -127,5 +127,5 @@
- (id)initMainThread: (id) sender;
- (void)leaveFullscreen;
- (void)enterFullscreen;
-- (id)getVoutView;
+- (id)voutView;
@end
diff --git a/modules/gui/macosx/vout.m b/modules/gui/macosx/vout.m
index 68bc7ae..8152b44 100644
--- a/modules/gui/macosx/vout.m
+++ b/modules/gui/macosx/vout.m
@@ -532,7 +532,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
( [o_event modifierFlags] & NSControlKeyMask ) ) )
{
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,
if( p_vout && [o_event type] == NSRightMouseDown )
{
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];
@@ -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
* NSRightMouseDown some how */
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];
@@ -701,8 +701,8 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
return (vout_thread_t *) p_vout->p_parent;
}
-+ (id)getVoutView: (vout_thread_t *)p_vout subView: (NSView *)view
- frame: (NSRect *)s_frame
++ (id)voutView: (vout_thread_t *)p_vout subView: (NSView *)view
+ frame: (NSRect *)s_frame
{
vlc_value_t value_drawable;
int i_timeout;
@@ -1139,7 +1139,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
[self setLevel: NSStatusWindowLevel];
}
-- (id)getVoutView // FIXME Naming scheme!
+- (id)voutView
{
return o_view;
}
diff --git a/modules/gui/macosx/voutgl.m b/modules/gui/macosx/voutgl.m
index fff52ee..fbdadd1 100644
--- a/modules/gui/macosx/voutgl.m
+++ b/modules/gui/macosx/voutgl.m
@@ -320,8 +320,8 @@ static void Unlock( vout_thread_t * p_vout )
/* Spawn the window */
id old_vout = p_vout->p_sys->o_vout_view;
- p_vout->p_sys->o_vout_view = [[VLCVoutView getVoutView: p_vout
- subView: p_vout->p_sys->o_glview frame: nil] retain];
+ p_vout->p_sys->o_vout_view = [[VLCVoutView voutView: p_vout
+ subView: p_vout->p_sys->o_glview frame: nil] retain];
[old_vout release];
}
@@ -348,16 +348,16 @@ static void Unlock( vout_thread_t * p_vout )
if( p_vout->p_sys->b_saved_frame )
{
id old_vout = p_vout->p_sys->o_vout_view;
- p_vout->p_sys->o_vout_view = [[VLCVoutView getVoutView: p_vout
- subView: o_glview
- frame: &p_vout->p_sys->s_frame] retain];
+ p_vout->p_sys->o_vout_view = [[VLCVoutView voutView: p_vout
+ subView: o_glview
+ frame: &p_vout->p_sys->s_frame] retain];
[old_vout release];
}
else
{
id old_vout = p_vout->p_sys->o_vout_view;
- p_vout->p_sys->o_vout_view = [[VLCVoutView getVoutView: p_vout
- subView: o_glview frame: nil] retain];
+ p_vout->p_sys->o_vout_view = [[VLCVoutView voutView: p_vout
+ subView: o_glview frame: nil] retain];
[old_vout release];
}
#undef o_glview
More information about the vlc-devel
mailing list