X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fplaylist.m;h=23c41cda8260d4141f4f22173ff2c09859ac3b37;hb=1b7abb6be95faf2738711b04f03b9eba38c58878;hp=beb617c1d5140ab7b87028b190f57fccabe163e0;hpb=f0436bfa55343cd1ff195fbb66a8f51fec6ea1fb;p=vlc diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m index beb617c1d5..23c41cda82 100644 --- a/modules/gui/macosx/playlist.m +++ b/modules/gui/macosx/playlist.m @@ -50,6 +50,7 @@ #import "vlc_osd.h" #import "misc.h" #import +#import /***************************************************************************** * VLCPlaylistView implementation @@ -111,10 +112,12 @@ } - (void)awakeFromNib { - playlist_t * p_playlist = pl_Yield( VLCIntf ); + playlist_t * p_playlist = pl_Hold( VLCIntf ); [o_outline_view setTarget: self]; [o_outline_view setDelegate: self]; [o_outline_view setDataSource: self]; + [o_outline_view setAllowsEmptySelection: NO]; + [o_outline_view expandItem: [o_outline_view itemAtRow:0]]; vlc_object_release( p_playlist ); [self initStrings]; @@ -147,8 +150,8 @@ { int i_return = 0; playlist_item_t *p_item = NULL; - playlist_t * p_playlist = pl_Yield( VLCIntf ); - assert( outlineView != o_outline_view ); + playlist_t * p_playlist = pl_Hold( VLCIntf ); + assert( outlineView == o_outline_view ); if( !item ) p_item = p_playlist->p_root_category; @@ -168,8 +171,9 @@ { playlist_item_t *p_return = NULL, *p_item = NULL; NSValue *o_value; - playlist_t * p_playlist = pl_Yield( VLCIntf ); + playlist_t * p_playlist = pl_Hold( VLCIntf ); + PL_LOCK; if( item == nil ) { /* root object */ @@ -181,14 +185,17 @@ } if( p_item && index < p_item->i_children && index >= 0 ) p_return = p_item->pp_children[index]; - + PL_UNLOCK; + vlc_object_release( p_playlist ); o_value = [o_outline_dict objectForKey:[NSString stringWithFormat: @"%p", p_return]]; 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; @@ -198,7 +205,7 @@ - (BOOL)outlineView:(NSOutlineView *)outlineView isItemExpandable:(id)item { int i_return = 0; - playlist_t *p_playlist = pl_Yield( VLCIntf ); + playlist_t *p_playlist = pl_Hold( VLCIntf ); if( item == nil ) { @@ -214,9 +221,9 @@ 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 */ @@ -255,7 +262,7 @@ 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 ); @@ -266,39 +273,39 @@ 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_item_HasErrorWhenReading( 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 @@ -349,9 +356,16 @@ return self; } +- (void)dealloc +{ + [o_nodes_array release]; + [o_items_array release]; + [super dealloc]; +} + - (void)awakeFromNib { - playlist_t * p_playlist = pl_Yield( VLCIntf ); + playlist_t * p_playlist = pl_Hold( VLCIntf ); int i; @@ -373,7 +387,7 @@ o_tc_sortColumn = nil; char ** ppsz_name; - char ** ppsz_services = services_discovery_GetServicesNames( p_playlist, &ppsz_name ); + char ** ppsz_services = vlc_sd_GetNames( &ppsz_name ); if( !ppsz_services ) { vlc_object_release( p_playlist ); @@ -383,12 +397,11 @@ 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: @@ -431,11 +444,16 @@ [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("Media Information...")]; + [o_mi_dl_cover_art setTitle: _NS("Download Cover Art")]; + [o_mi_preparse setTitle: _NS("Fetch Meta Data")]; + [o_mi_revealInFinder setTitle: _NS("Reveal in Finder")]; + [o_mm_mi_revealInFinder setTitle: _NS("Reveal in Finder")]; + [[o_mm_mi_revealInFinder menu] setAutoenablesItems: NO]; [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")]; + [o_mm_mi_services setTitle: _NS("Services discovery")]; [o_status_field setStringValue: _NS("No items in the playlist")]; [o_search_field setToolTip: _NS("Search in Playlist")]; @@ -463,12 +481,13 @@ [[[[VLCMain sharedInstance] getWizard] getPlaylistWizard] reloadOutlineView]; [[[[VLCMain sharedInstance] getBookmarks] getDataTable] reloadData]; - playlist_t *p_playlist = pl_Yield( VLCIntf ); + playlist_t *p_playlist = pl_Hold( VLCIntf ); + PL_LOCK; 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 @@ -476,14 +495,17 @@ 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")]; } + PL_UNLOCK; vlc_object_release( p_playlist ); + + [self outlineViewSelectionDidChange: nil]; } - (void)playModeUpdated { - playlist_t *p_playlist = pl_Yield( VLCIntf ); + playlist_t *p_playlist = pl_Hold( VLCIntf ); bool loop = var_GetBool( p_playlist, "loop" ); bool repeat = var_GetBool( p_playlist, "repeat" ); @@ -499,19 +521,62 @@ 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]; + + if( [[VLCMain sharedInstance] isPlaylistCollapsed] == NO ) + { + /* update our info-panel to reflect the new item, if we aren't collapsed */ + [[[VLCMain sharedInstance] getInfo] updatePanelWithItem:p_item->p_input]; + } + } +} + +- (BOOL)isSelectionEmpty +{ + return [o_outline_view selectedRow] == -1; +} + - (void)updateRowSelection { int i_row; unsigned int j; - playlist_t *p_playlist = pl_Yield( VLCIntf ); + // FIXME: unsafe + playlist_t *p_playlist = pl_Hold( VLCIntf ); playlist_item_t *p_item, *p_temp_item; NSMutableArray *o_array = [NSMutableArray array]; - p_item = p_playlist->status.p_item; + p_item = playlist_CurrentPlayingItem( p_playlist ); if( p_item == NULL ) { - vlc_object_release(p_playlist); + pl_Release( VLCIntf ); return; } @@ -534,22 +599,21 @@ } - vlc_object_release( p_playlist ); - - /* update our info-panel to reflect the new item */ - [[[VLCMain sharedInstance] getInfo] updatePanel]; + pl_Release( VLCIntf ); } /* 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 ); + playlist_t * p_playlist = pl_Hold( VLCIntf ); playlist_item_t *p_temp_item = p_item; if( p_node == p_item ) @@ -567,7 +631,7 @@ if ( p_temp_item ) { int i; - PL_LOCK; + if(!b_locked) PL_LOCK; if( b_check ) { @@ -579,8 +643,8 @@ 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; } } @@ -591,18 +655,25 @@ 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 @@ -618,7 +689,7 @@ } 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 @@ -628,12 +699,11 @@ } } } - } - (IBAction)savePlaylist:(id)sender { - playlist_t * p_playlist = pl_Yield( VLCIntf ); + playlist_t * p_playlist = pl_Hold( VLCIntf ); NSSavePanel *o_save_panel = [NSSavePanel savePanel]; NSString * o_name = [NSString stringWithFormat: @"%@", _NS("Untitled")]; @@ -696,7 +766,7 @@ - (IBAction)playItem:(id)sender { intf_thread_t * p_intf = VLCIntf; - playlist_t * p_playlist = pl_Yield( p_intf ); + playlist_t * p_playlist = pl_Hold( p_intf ); playlist_item_t *p_item; playlist_item_t *p_node = NULL; @@ -722,18 +792,39 @@ 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 ); } +- (IBAction)revealItemInFinder:(id)sender +{ + playlist_item_t * p_item = [[o_outline_view itemAtRow:[o_outline_view selectedRow]] pointerValue]; + NSMutableString * o_mrl = nil; + + if(! p_item || !p_item->p_input ) + return; + + 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] == '/' ) + [[NSWorkspace sharedWorkspace] selectFile: o_mrl inFileViewerRootedAtPath: o_mrl]; +} + /* When called retrieves the selected outlineview row and plays that node or item */ - (IBAction)preparseItem:(id)sender { int i_count; NSMutableArray *o_to_preparse; intf_thread_t * p_intf = VLCIntf; - playlist_t * p_playlist = pl_Yield( p_intf ); + playlist_t * p_playlist = pl_Hold( p_intf ); o_to_preparse = [NSMutableArray arrayWithArray:[[o_outline_view selectedRowEnumerator] allObjects]]; i_count = [o_to_preparse count]; @@ -754,7 +845,7 @@ { if( p_item->i_children == -1 ) { - playlist_PreparseEnqueue( p_playlist, p_item->p_input ); + playlist_PreparseEnqueue( p_playlist, p_item->p_input, pl_Unlocked ); } else { @@ -766,11 +857,42 @@ [self playlistUpdated]; } +- (IBAction)downloadCoverArt:(id)sender +{ + int i_count; + NSMutableArray *o_to_preparse; + intf_thread_t * p_intf = VLCIntf; + playlist_t * p_playlist = pl_Hold( p_intf ); + + o_to_preparse = [NSMutableArray arrayWithArray:[[o_outline_view selectedRowEnumerator] allObjects]]; + i_count = [o_to_preparse count]; + + int i, i_row; + NSNumber *o_number; + playlist_item_t *p_item = NULL; + + for( i = 0; i < i_count; i++ ) + { + o_number = [o_to_preparse lastObject]; + i_row = [o_number intValue]; + p_item = [[o_outline_view itemAtRow:i_row] pointerValue]; + [o_to_preparse removeObject: o_number]; + [o_outline_view deselectRow: i_row]; + + if( p_item && p_item->i_children == -1 ) + { + playlist_AskForArtEnqueue( p_playlist, p_item->p_input, pl_Unlocked ); + } + } + vlc_object_release( p_playlist ); + [self playlistUpdated]; +} + - (IBAction)servicesChange:(id)sender { NSMenuItem *o_mi = (NSMenuItem *)sender; NSString *o_string = [o_mi representedObject]; - playlist_t * p_playlist = pl_Yield( VLCIntf ); + playlist_t * p_playlist = pl_Hold( VLCIntf ); if( !playlist_IsServicesDiscoveryLoaded( p_playlist, [o_string UTF8String] ) ) playlist_ServicesDiscoveryAdd( p_playlist, [o_string UTF8String] ); else @@ -801,7 +923,7 @@ o_to_delete = [NSMutableArray arrayWithArray:[[o_outline_view selectedRowEnumerator] allObjects]]; i_count = [o_to_delete count]; - p_playlist = pl_Yield( p_intf ); + p_playlist = pl_Hold( p_intf ); PL_LOCK; for( int i = 0; i < i_count; i++ ) @@ -820,17 +942,17 @@ if( p_item->i_children != -1 ) //is a node and not an item { - if( p_playlist->status.i_status != PLAYLIST_STOPPED && - [self isItem: p_playlist->status.p_item inNode: + if( playlist_Status( p_playlist ) != PLAYLIST_STOPPED && + [self isItem: playlist_CurrentPlayingItem( p_playlist ) 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; @@ -850,7 +972,7 @@ - (void)sortNode:(int)i_mode { - playlist_t * p_playlist = pl_Yield( VLCIntf ); + playlist_t * p_playlist = pl_Hold( VLCIntf ); playlist_item_t * p_item; if( [o_outline_view selectedRow] > -1 ) @@ -883,7 +1005,7 @@ - (input_item_t *)createItem:(NSDictionary *)o_one_item { intf_thread_t * p_intf = VLCIntf; - playlist_t * p_playlist = pl_Yield( p_intf ); + playlist_t * p_playlist = pl_Hold( p_intf ); input_item_t *p_input; int i; @@ -943,7 +1065,7 @@ o_uri = o_temp; } - p_input = input_ItemNew( p_playlist, [o_uri fileSystemRepresentation], [o_name UTF8String] ); + p_input = input_item_New( p_playlist, [o_uri fileSystemRepresentation], [o_name UTF8String] ); if( !p_input ) return NULL; @@ -951,7 +1073,7 @@ { for( i = 0; i < (int)[o_options count]; i++ ) { - input_ItemAddOption( p_input, strdup( [[o_options objectAtIndex:i] UTF8String] ) ); + input_item_AddOption( p_input, strdup( [[o_options objectAtIndex:i] UTF8String] ) ); } } @@ -970,8 +1092,9 @@ - (void)appendArray:(NSArray*)o_array atPos:(int)i_position enqueue:(BOOL)b_enqueue { int i_item; - playlist_t * p_playlist = pl_Yield( VLCIntf ); + playlist_t * p_playlist = pl_Hold( VLCIntf ); + PL_LOCK; for( i_item = 0; i_item < (int)[o_array count]; i_item++ ) { input_item_t *p_input; @@ -987,24 +1110,35 @@ /* 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 ); + playlist_item_t *p_item = NULL; + playlist_item_t *p_node = NULL; + p_item = playlist_ItemGetByInput( p_playlist, p_input, pl_Locked ); + if( p_item ) + { + if( p_item->i_children == -1 ) + p_node = p_item->p_parent; + else + { + p_node = p_item; + if( p_node->i_children > 0 && p_node->pp_children[0]->i_children == -1 ) + p_item = p_node->pp_children[0]; + else + p_item = NULL; + } + playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, pl_Locked, p_node, p_item ); + } } vlc_gc_decref( p_input ); } + PL_UNLOCK; + [self playlistUpdated]; vlc_object_release( p_playlist ); } @@ -1012,7 +1146,7 @@ - (void)appendNodeArray:(NSArray*)o_array inNode:(playlist_item_t *)p_node atPos:(int)i_position enqueue:(BOOL)b_enqueue { int i_item; - playlist_t * p_playlist = pl_Yield( VLCIntf ); + playlist_t * p_playlist = pl_Hold( VLCIntf ); for( i_item = 0; i_item < (int)[o_array count]; i_item++ ) { @@ -1022,31 +1156,26 @@ /* 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, p_node, p_item ); } + PL_UNLOCK; vlc_gc_decref( p_input ); } [self playlistUpdated]; @@ -1055,7 +1184,7 @@ - (NSMutableArray *)subSearchItem:(playlist_item_t *)p_item { - playlist_t *p_playlist = pl_Yield( VLCIntf ); + playlist_t *p_playlist = pl_Hold( VLCIntf ); playlist_item_t *p_selected_item; int i_current, i_selected_row; @@ -1074,7 +1203,7 @@ PL_LOCK; o_current_name = [NSString stringWithUTF8String: p_item->pp_children[i_current]->p_input->psz_name]; - psz_temp = input_ItemGetInfo( p_item->p_input , + psz_temp = input_item_GetInfo( p_item->p_input , _("Meta-information"),_("Artist") ); o_current_author = [NSString stringWithUTF8String: psz_temp]; free( psz_temp); @@ -1122,7 +1251,7 @@ - (IBAction)searchItem:(id)sender { - playlist_t * p_playlist = pl_Yield( VLCIntf ); + playlist_t * p_playlist = pl_Hold( VLCIntf ); id o_result; unsigned int i; @@ -1192,8 +1321,11 @@ pt = [o_outline_view convertPoint: [o_event locationInWindow] fromView: nil]; - b_item_sel = ( [o_outline_view rowAtPoint: pt] != -1 && - [o_outline_view selectedRow] != -1 ); + int 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]; @@ -1208,13 +1340,13 @@ return( o_ctx_menu ); } -- (void)outlineView: (NSTableView*)o_tv +- (void)outlineView: (NSOutlineView *)o_tv didClickTableColumn:(NSTableColumn *)o_tc { - int i_mode = 0, i_type; + int i_mode, i_type = 0; intf_thread_t *p_intf = VLCIntf; - playlist_t *p_playlist = pl_Yield( p_intf ); + playlist_t *p_playlist = pl_Hold( p_intf ); /* Check whether the selected table column header corresponds to a sortable table column*/ @@ -1251,9 +1383,9 @@ i_type = ORDER_NORMAL; } - vlc_mutex_lock( &p_playlist->object_lock ); + PL_LOCK; playlist_RecursiveNodeSort( p_playlist, p_playlist->p_root_category, i_mode, i_type ); - vlc_mutex_unlock( &p_playlist->object_lock ); + PL_UNLOCK; vlc_object_release( p_playlist ); [self playlistUpdated]; @@ -1279,22 +1411,22 @@ forTableColumn:(NSTableColumn *)tableColumn item:(id)item { - playlist_t *p_playlist = pl_Yield( VLCIntf ); + playlist_t *p_playlist = pl_Hold( VLCIntf ); id o_playing_item; o_playing_item = [o_outline_dict objectForKey: - [NSString stringWithFormat:@"%p", p_playlist->status.p_item]]; + [NSString stringWithFormat:@"%p", playlist_CurrentPlayingItem( p_playlist )]]; if( [self isItem: [o_playing_item pointerValue] inNode: [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 ); } @@ -1314,29 +1446,30 @@ NSAutoreleasePool * ourPool = [[NSAutoreleasePool alloc] init]; /* simply adds a new node to the end of the playlist */ - playlist_t * p_playlist = pl_Yield( VLCIntf ); + playlist_t * p_playlist = pl_Hold( VLCIntf ); vlc_thread_set_priority( p_playlist, VLC_THREAD_PRIORITY_LOW ); int ret_v; char *psz_name = NULL; - playlist_item_t * p_item; ret_v = intf_UserStringInput( p_playlist, _("New Node"), _("Please enter a name for the new node."), &psz_name ); - if( ret_v != DIALOG_CANCELLED && psz_name && *psz_name ) - p_item = playlist_NodeCreate( p_playlist, psz_name, + PL_LOCK; + if( ret_v != DIALOG_CANCELLED && psz_name ) + { + playlist_NodeCreate( p_playlist, psz_name, p_playlist->p_local_category, 0, NULL ); + } else if(! config_GetInt( p_playlist, "interact" ) ) { /* in case that the interaction is disabled, just give it a bogus name */ - p_item = playlist_NodeCreate( p_playlist, _("Empty Folder"), + playlist_NodeCreate( p_playlist, _("Empty Folder"), p_playlist->p_local_category, 0, NULL ); } + PL_UNLOCK; - if(! p_item ) - msg_Warn( VLCIntf, "node creation failed or cancelled by user" ); - - vlc_object_release( p_playlist ); + free( psz_name ); + pl_Release( VLCIntf ); [ourPool release]; } @@ -1347,12 +1480,13 @@ - (id)outlineView:(NSOutlineView *)outlineView child:(int)index ofItem:(id)item { id o_value = [super outlineView: outlineView child: index ofItem: item]; - playlist_t *p_playlist = pl_Yield( VLCIntf ); + playlist_t *p_playlist = pl_Hold( VLCIntf ); + PL_LOCK; 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 @@ -1363,16 +1497,15 @@ } else { - [o_status_field setStringValue: _NS("1 item in the playlist")]; + [o_status_field setStringValue: _NS("1 item")]; } } + PL_UNLOCK; + 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; } @@ -1381,7 +1514,7 @@ - (BOOL)outlineView:(NSOutlineView *)outlineView writeItems:(NSArray *)items toPasteboard:(NSPasteboard *)pboard { unsigned int i; - playlist_t *p_playlist = pl_Yield( VLCIntf ); + playlist_t *p_playlist = pl_Hold( VLCIntf ); /* First remove the items that were moved during the last drag & drop operation */ @@ -1396,9 +1529,11 @@ (Service Discovery) */ if( ![self isItem: [o_item pointerValue] inNode: p_playlist->p_local_category checkItemExistence: NO] && - ( var_CreateGetBool( p_playlist, "media-library" ) && + var_CreateGetBool( p_playlist, "media-library" ) && ![self isItem: [o_item pointerValue] inNode: - p_playlist->p_ml_category checkItemExistence: NO]) ) + p_playlist->p_ml_category checkItemExistence: NO] || + [o_item pointerValue] == p_playlist->p_local_category || + [o_item pointerValue] == p_playlist->p_ml_category ) { vlc_object_release(p_playlist); return NO; @@ -1428,7 +1563,7 @@ - (NSDragOperation)outlineView:(NSOutlineView *)outlineView validateDrop:(id )info proposedItem:(id)item proposedChildIndex:(int)index { - playlist_t *p_playlist = pl_Yield( VLCIntf ); + playlist_t *p_playlist = pl_Hold( VLCIntf ); NSPasteboard *o_pasteboard = [info draggingPasteboard]; if( !p_playlist ) return NSDragOperationNone; @@ -1492,7 +1627,7 @@ - (BOOL)outlineView:(NSOutlineView *)outlineView acceptDrop:(id )info item:(id)item childIndex:(int)index { - playlist_t * p_playlist = pl_Yield( VLCIntf ); + playlist_t * p_playlist = pl_Hold( VLCIntf ); NSPasteboard *o_pasteboard = [info draggingPasteboard]; /* Drag & Drop inside the playlist */ @@ -1605,18 +1740,13 @@ 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;