[vlc-devel] commit: macosx: fix previous commit ( Felix Paul Kühne )
git version control
git at videolan.org
Sun Jan 4 20:15:55 CET 2009
vlc | branch: 0.9-bugfix | Felix Paul Kühne <fkuehne at videolan.org> | Sun Jan 4 20:15:43 2009 +0100| [0d71f1b0530f48428c66c7e865964d628cf1d485] | committer: Felix Paul Kühne
macosx: fix previous commit
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0d71f1b0530f48428c66c7e865964d628cf1d485
---
modules/gui/macosx/intf.m | 7 +++++--
modules/gui/macosx/playlist.m | 31 -------------------------------
2 files changed, 5 insertions(+), 33 deletions(-)
diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 805b3d2..3e312db 100644
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -1485,8 +1485,7 @@ static void * ManageThread( void *user_data )
/* update our info-panel to reflect the new item */
[[[VLCMain sharedInstance] getInfo]
- updatePanelWithItem:
- playlist_CurrentPlayingItem( p_playlist )->p_input];
+ updatePanelWithItem: p_playlist->status.p_item->p_input];
/* seekable streams */
b_seekable = var_GetBool( p_input, "seekable" );
@@ -1579,6 +1578,7 @@ static void * ManageThread( void *user_data )
[o_playlist updateRowSelection];
p_intf->p_sys->b_current_title_update = FALSE;
+ p_intf->p_sys->b_intf_update = true;
}
if( [o_timeslider isEnabled] )
@@ -1601,6 +1601,9 @@ static void * ManageThread( void *user_data )
[o_timefield setStringValue: o_time];
[[[self getControls] getFSPanel] setStreamPos: f_updated andTime: o_time];
[o_embedded_window setTime: o_time position: f_updated];
+
+ [o_main_pgbar stopAnimation:self];
+ [o_main_pgbar setHidden:YES];
}
/* Manage Playing status */
diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m
index 28b49b5..3423f73 100644
--- a/modules/gui/macosx/playlist.m
+++ b/modules/gui/macosx/playlist.m
@@ -515,37 +515,6 @@
vlc_object_release( p_playlist );
}
-- (void)outlineViewSelectionDidChange:(NSNotification *)notification
-{
- // FIXME: unsafe
- playlist_item_t * p_item = [[o_outline_view itemAtRow:[o_outline_view selectedRow]] pointerValue];
-
- if( p_item )
- {
- /* update the state of our Reveal-in-Finder menu items */
- NSMutableString *o_mrl;
- char *psz_uri = input_item_GetURI( p_item->p_input );
- if( psz_uri )
- {
- o_mrl = [NSMutableString stringWithUTF8String: psz_uri];
-
- /* perform some checks whether it is a file and if it is local at all... */
- NSRange prefix_range = [o_mrl rangeOfString: @"file:"];
- if( prefix_range.location != NSNotFound )
- [o_mrl deleteCharactersInRange: prefix_range];
-
- if( [o_mrl characterAtIndex:0] == '/' )
- {
- [o_mi_revealInFinder setEnabled: YES];
- [o_mm_mi_revealInFinder setEnabled: YES];
- return;
- }
- }
- [o_mi_revealInFinder setEnabled: NO];
- [o_mm_mi_revealInFinder setEnabled: NO];
- }
-}
-
- (BOOL)isSelectionEmpty
{
return [o_outline_view selectedRow] == -1;
More information about the vlc-devel
mailing list