Commit 0d71f1b0 authored by Felix Paul Kühne's avatar Felix Paul Kühne

macosx: fix previous commit

parent 2609302d
...@@ -1485,8 +1485,7 @@ static void * ManageThread( void *user_data ) ...@@ -1485,8 +1485,7 @@ static void * ManageThread( void *user_data )
/* update our info-panel to reflect the new item */ /* update our info-panel to reflect the new item */
[[[VLCMain sharedInstance] getInfo] [[[VLCMain sharedInstance] getInfo]
updatePanelWithItem: updatePanelWithItem: p_playlist->status.p_item->p_input];
playlist_CurrentPlayingItem( p_playlist )->p_input];
/* seekable streams */ /* seekable streams */
b_seekable = var_GetBool( p_input, "seekable" ); b_seekable = var_GetBool( p_input, "seekable" );
...@@ -1579,6 +1578,7 @@ static void * ManageThread( void *user_data ) ...@@ -1579,6 +1578,7 @@ static void * ManageThread( void *user_data )
[o_playlist updateRowSelection]; [o_playlist updateRowSelection];
p_intf->p_sys->b_current_title_update = FALSE; p_intf->p_sys->b_current_title_update = FALSE;
p_intf->p_sys->b_intf_update = true;
} }
if( [o_timeslider isEnabled] ) if( [o_timeslider isEnabled] )
...@@ -1601,6 +1601,9 @@ static void * ManageThread( void *user_data ) ...@@ -1601,6 +1601,9 @@ static void * ManageThread( void *user_data )
[o_timefield setStringValue: o_time]; [o_timefield setStringValue: o_time];
[[[self getControls] getFSPanel] setStreamPos: f_updated andTime: o_time]; [[[self getControls] getFSPanel] setStreamPos: f_updated andTime: o_time];
[o_embedded_window setTime: o_time position: f_updated]; [o_embedded_window setTime: o_time position: f_updated];
[o_main_pgbar stopAnimation:self];
[o_main_pgbar setHidden:YES];
} }
/* Manage Playing status */ /* Manage Playing status */
......
...@@ -515,37 +515,6 @@ ...@@ -515,37 +515,6 @@
vlc_object_release( p_playlist ); 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 - (BOOL)isSelectionEmpty
{ {
return [o_outline_view selectedRow] == -1; return [o_outline_view selectedRow] == -1;
......
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