[o_outline_view setTarget: self];
[o_outline_view setDelegate: self];
[o_outline_view setDataSource: self];
+ [o_outline_view setAllowsEmptySelection: NO];
vlc_object_release( p_playlist );
[self initStrings];
int i_return = 0;
playlist_item_t *p_item = NULL;
playlist_t * p_playlist = pl_Yield( VLCIntf );
- assert( outlineView != o_outline_view );
+ assert( outlineView == o_outline_view );
if( !item )
p_item = p_playlist->p_root_category;
if( o_value == nil )
{
- msg_Warn( VLCIntf, "playlist item misses pointer value, adding one" );
+ /* Why is there a warning if that happens all the time and seems
+ * to be normal? Add an assert and fix it.
+ * msg_Warn( VLCIntf, "playlist item misses pointer value, adding one" ); */
o_value = [[NSValue valueWithPointer: p_return] retain];
}
return o_value;
if( p_item )
i_return = p_item->i_children;
}
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
- return (i_return > 0);
+ return (i_return >= 0);
}
/* retrieve the string values for the cells */
attempted_reload = NO;
- if( [[o_tc identifier] isEqualToString:@"1"] )
+ if( [[o_tc identifier] isEqualToString:@"name"] )
{
/* sanity check to prevent the NSString class from crashing */
char *psz_title = input_item_GetTitle( p_item->p_input );
else
{
char *psz_name = input_item_GetName( p_item->p_input );
- if( !EMPTY_STR( psz_name ) )
- {
+ if( psz_name )
o_value = [NSString stringWithUTF8String: psz_name];
- }
free( psz_name );
}
free( psz_title );
}
- else
+ else if( [[o_tc identifier] isEqualToString:@"artist"] )
{
char *psz_artist = input_item_GetArtist( p_item->p_input );
- if( [[o_tc identifier] isEqualToString:@"2"] && !EMPTY_STR( psz_artist ) )
- {
+ if( psz_artist )
o_value = [NSString stringWithUTF8String: psz_artist];
+ free( psz_artist );
+ }
+ else if( [[o_tc identifier] isEqualToString:@"duration"] )
+ {
+ char psz_duration[MSTRTIME_MAX_SIZE];
+ mtime_t dur = input_item_GetDuration( p_item->p_input );
+ if( dur != -1 )
+ {
+ secstotimestr( psz_duration, dur/1000000 );
+ o_value = [NSString stringWithUTF8String: psz_duration];
}
- else if( [[o_tc identifier] isEqualToString:@"3"] )
+ else
+ o_value = @"--:--";
+ }
+ else if( [[o_tc identifier] isEqualToString:@"status"] )
+ {
+ if( input_ItemHasErrorWhenReading( p_item->p_input ) )
{
- char psz_duration[MSTRTIME_MAX_SIZE];
- mtime_t dur = input_item_GetDuration( p_item->p_input );
- if( dur != -1 )
- {
- secstotimestr( psz_duration, dur/1000000 );
- o_value = [NSString stringWithUTF8String: psz_duration];
- }
- else
- {
- o_value = @"-:--:--";
- }
+ o_value = [NSImage imageWithWarningIcon];
}
- free( psz_artist );
}
-
- return( o_value );
+ return o_value;
}
@end
return self;
}
+- (void)dealloc
+{
+ [o_nodes_array release];
+ [o_items_array release];
+ [super dealloc];
+}
+
- (void)awakeFromNib
{
playlist_t * p_playlist = pl_Yield( VLCIntf );
for( i = 0; ppsz_services[i]; i++ )
{
bool b_enabled;
- char *objectname;
NSMenuItem *o_lmi;
char * name = ppsz_name[i] ? ppsz_name[i] : ppsz_services[i];
/* Check whether to enable these menuitems */
- b_enabled = playlist_IsServicesDiscoveryLoaded( p_playlist, objectname );
+ b_enabled = playlist_IsServicesDiscoveryLoaded( p_playlist, ppsz_services[i] );
/* Create the menu entries used in the playlist menu */
o_lmi = [[o_mi_services submenu] addItemWithTitle:
[o_mi_delete setTitle: _NS("Delete")];
[o_mi_recursive_expand setTitle: _NS("Expand Node")];
[o_mi_selectall setTitle: _NS("Select All")];
- [o_mi_info setTitle: _NS("Information")];
- [o_mi_preparse setTitle: _NS("Get Stream Information")];
+ [o_mi_info setTitle: _NS("Information...")];
+ [o_mi_preparse setTitle: _NS("Fetch Meta Data")];
[o_mi_sort_name setTitle: _NS("Sort Node by Name")];
[o_mi_sort_author setTitle: _NS("Sort Node by Author")];
[o_mi_services setTitle: _NS("Services discovery")];
if( playlist_CurrentSize( p_playlist ) >= 2 )
{
[o_status_field setStringValue: [NSString stringWithFormat:
- _NS("%i items in the playlist"),
+ _NS("%i items"),
playlist_CurrentSize( p_playlist )]];
}
else
if( playlist_IsEmpty( p_playlist ) )
[o_status_field setStringValue: _NS("No items in the playlist")];
else
- [o_status_field setStringValue: _NS("1 item in the playlist")];
+ [o_status_field setStringValue: _NS("1 item")];
}
vlc_object_release( p_playlist );
+
+ [self outlineViewSelectionDidChange: nil];
}
- (void)playModeUpdated
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 our info-panel to reflect the new item */
+ [[[VLCMain sharedInstance] getInfo] updatePanelWithItem:p_item->p_input];
+ }
+}
+
+- (BOOL)isSelectionEmpty
+{
+ return [o_outline_view selectedRow] == -1;
+}
+
- (void)updateRowSelection
{
int i_row;
unsigned int j;
+ // FIXME: unsafe
playlist_t *p_playlist = pl_Yield( VLCIntf );
playlist_item_t *p_item, *p_temp_item;
NSMutableArray *o_array = [NSMutableArray array];
vlc_object_release( p_playlist );
- /* update our info-panel to reflect the new item */
- [[[VLCMain sharedInstance] getInfo] updatePanel];
}
/* Check if p_item is a child of p_node recursively. We need to check the item
existence first since OSX sometimes tries to redraw items that have been
- deleted. We don't do it when not required since this verification takes
+ deleted. We don't do it when not required since this verification takes
quite a long time on big playlists (yes, pretty hacky). */
+
- (BOOL)isItem: (playlist_item_t *)p_item
inNode: (playlist_item_t *)p_node
checkItemExistence:(BOOL)b_check
+ locked:(BOOL)b_locked
{
playlist_t * p_playlist = pl_Yield( VLCIntf );
if ( p_temp_item )
{
int i;
- PL_LOCK;
+ if(!b_locked) PL_LOCK;
if( b_check )
{
if( ARRAY_VAL( p_playlist->all_items, i) == p_item ) break;
else if ( i == p_playlist->all_items.i_size - 1 )
{
+ if(!b_locked) PL_UNLOCK;
vlc_object_release( p_playlist );
- PL_UNLOCK;
return NO;
}
}
p_temp_item = p_temp_item->p_parent;
if( p_temp_item == p_node )
{
- PL_UNLOCK;
+ if(!b_locked) PL_UNLOCK;
vlc_object_release( p_playlist );
return YES;
}
}
- PL_UNLOCK;
+ if(!b_locked) PL_UNLOCK;
}
vlc_object_release( p_playlist );
return NO;
}
+- (BOOL)isItem: (playlist_item_t *)p_item
+ inNode: (playlist_item_t *)p_node
+ checkItemExistence:(BOOL)b_check
+{
+ [self isItem:p_item inNode:p_node checkItemExistence:b_check locked:NO];
+}
+
/* This method is usefull for instance to remove the selected children of an
already selected node */
- (void)removeItemsFrom:(id)o_items ifChildrenOf:(id)o_nodes
}
if( [self isItem: [[o_items objectAtIndex:i] pointerValue]
inNode: [[o_nodes objectAtIndex:j] pointerValue]
- checkItemExistence: NO] )
+ checkItemExistence: NO locked:NO] )
{
[o_items removeObjectAtIndex:i];
/* We need to execute the next iteration with the same index
}
}
}
-
}
- (IBAction)savePlaylist:(id)sender
p_item = NULL;
}
}
- playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, true, p_node, p_item );
+ playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, pl_Unlocked, p_node, p_item );
}
vlc_object_release( p_playlist );
}
if( p_playlist->status.i_status != PLAYLIST_STOPPED &&
[self isItem: p_playlist->status.p_item inNode:
((playlist_item_t *)[o_item pointerValue])
- checkItemExistence: NO] == YES )
+ checkItemExistence: NO locked:YES] == YES )
// if current item is in selected node and is playing then stop playlist
- playlist_Stop( p_playlist );
+ playlist_Control(p_playlist, PLAYLIST_STOP, pl_Locked );
playlist_NodeDelete( p_playlist, p_item, true, false );
}
else
- playlist_DeleteFromInput( p_playlist, p_item->p_input->i_id, true );
+ playlist_DeleteFromInput( p_playlist, p_item->p_input->i_id, pl_Locked );
}
PL_UNLOCK;
int i_item;
playlist_t * p_playlist = pl_Yield( VLCIntf );
+ PL_LOCK;
for( i_item = 0; i_item < (int)[o_array count]; i_item++ )
{
input_item_t *p_input;
/* Add the item */
/* FIXME: playlist_AddInput() can fail */
+
playlist_AddInput( p_playlist, p_input, PLAYLIST_INSERT,
i_position == -1 ? PLAYLIST_END : i_position + i_item, true,
- false );
+ pl_Locked );
if( i_item == 0 && !b_enqueue )
{
playlist_item_t *p_item;
- p_item = playlist_ItemGetByInput( p_playlist, p_input, true );
- playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, true, NULL, p_item );
- }
- else
- {
- playlist_item_t *p_item;
- p_item = playlist_ItemGetByInput( p_playlist, p_input, true );
- playlist_Control( p_playlist, PLAYLIST_SKIP, true, p_item );
+ p_item = playlist_ItemGetByInput( p_playlist, p_input, pl_Locked );
+ playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, pl_Locked, NULL, p_item );
}
vlc_gc_decref( p_input );
}
+ PL_UNLOCK;
+
[self playlistUpdated];
vlc_object_release( p_playlist );
}
/* Get the item */
o_one_item = [o_array objectAtIndex: i_item];
p_input = [self createItem: o_one_item];
- if( !p_input )
- {
- continue;
- }
+
+ if( !p_input ) continue;
/* Add the item */
- /* FIXME: playlist_NodeAddInput() can fail */
- playlist_NodeAddInput( p_playlist, p_input, p_node,
+ /* FIXME: playlist_BothAddInput() can fail */
+ PL_LOCK;
+ playlist_BothAddInput( p_playlist, p_input, p_node,
PLAYLIST_INSERT,
i_position == -1 ?
- PLAYLIST_END : i_position + i_item, false );
+ PLAYLIST_END : i_position + i_item,
+ NULL, NULL, pl_Locked );
if( i_item == 0 && !b_enqueue )
{
playlist_item_t *p_item;
- p_item = playlist_ItemGetByInput( p_playlist, p_input, true );
- playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, true, NULL, p_item );
- }
- else
- {
- playlist_item_t *p_item;
- p_item = playlist_ItemGetByInput( p_playlist, p_input, true );
- playlist_Control( p_playlist, PLAYLIST_SKIP, true, p_item );
+ p_item = playlist_ItemGetByInput( p_playlist, p_input, pl_Locked );
+ playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, pl_Locked, NULL, p_item );
}
+ PL_UNLOCK;
vlc_gc_decref( p_input );
}
[self playlistUpdated];
pt = [o_outline_view convertPoint: [o_event locationInWindow]
fromView: nil];
- b_item_sel = ( [o_outline_view rowAtPoint: pt] != -1 &&
- [o_outline_view selectedRow] != -1 );
+ NSInteger row = [o_outline_view rowAtPoint:pt];
+ if( row != -1 )
+ [o_outline_view selectRowIndexes:[NSIndexSet indexSetWithIndex:row] byExtendingSelection:NO];
+
+ b_item_sel = ( row != -1 && [o_outline_view selectedRow] != -1 );
b_rows = [o_outline_view numberOfRows] != 0;
[o_mi_play setEnabled: b_item_sel];
i_type = ORDER_NORMAL;
}
- vlc_mutex_lock( &p_playlist->object_lock );
+ vlc_object_lock( p_playlist );
playlist_RecursiveNodeSort( p_playlist, p_playlist->p_root_category, i_mode, i_type );
- vlc_mutex_unlock( &p_playlist->object_lock );
+ vlc_object_unlock( p_playlist );
vlc_object_release( p_playlist );
[self playlistUpdated];
[item pointerValue] checkItemExistence: YES]
|| [o_playing_item isEqual: item] )
{
- [cell setFont: [NSFont boldSystemFontOfSize: 0]];
+ [cell setFont: [[NSFontManager sharedFontManager] convertFont:[cell font] toHaveTrait:NSBoldFontMask]];
}
else
{
- [cell setFont: [NSFont systemFontOfSize: 0]];
+ [cell setFont: [[NSFontManager sharedFontManager] convertFont:[cell font] toNotHaveTrait:NSBoldFontMask]];
}
vlc_object_release( p_playlist );
}
if( playlist_CurrentSize( p_playlist ) >= 2 )
{
[o_status_field setStringValue: [NSString stringWithFormat:
- _NS("%i items in the playlist"),
+ _NS("%i items"),
playlist_CurrentSize( p_playlist )]];
}
else
}
else
{
- [o_status_field setStringValue: _NS("1 item in the playlist")];
+ [o_status_field setStringValue: _NS("1 item")];
}
}
vlc_object_release( p_playlist );
[o_outline_dict setObject:o_value forKey:[NSString stringWithFormat:@"%p",
[o_value pointerValue]]];
-#ifndef NDEBUG
- msg_Dbg( VLCIntf, "adding item %p", [o_value pointerValue] );
-#endif
return o_value;
}
if ( item == nil )
{
- [self appendArray: o_array atPos: index enqueue: YES];
- }
- /* This should never occur */
- else if( p_node->i_children == -1 )
- {
- vlc_object_release( p_playlist );
- return NO;
+ [self appendArray:o_array atPos:index enqueue: YES];
}
else
{
- [self appendNodeArray: o_array inNode: p_node
- atPos: index enqueue: YES];
+ assert( p_node->i_children != -1 );
+ [self appendNodeArray:o_array inNode: p_node
+ atPos:index enqueue:YES];
}
vlc_object_release( p_playlist );
return YES;
projects / vlc / blobdiff