X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fplaylist.m;h=5e01eda7cbdf8c4d0308eb18b3a357497de148ad;hb=de587c237065de4696d9d035d0504cdf34990d87;hp=d9f137089516f811bc0a3a673e69a568d2812319;hpb=857b51f9c9ace345a6b6a9a45a20829101830abb;p=vlc diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m index d9f1370895..5e01eda7cb 100644 --- a/modules/gui/macosx/playlist.m +++ b/modules/gui/macosx/playlist.m @@ -1,7 +1,7 @@ /***************************************************************************** * playlist.m: MacOS X interface module ***************************************************************************** -* Copyright (C) 2002-2006 the VideoLAN team +* Copyright (C) 2002-2008 the VideoLAN team * $Id$ * * Authors: Jon Lech Johansen @@ -25,7 +25,6 @@ /* TODO * add 'icons' for different types of nodes? (http://www.cocoadev.com/index.pl?IconAndTextInTableCell) - * create toggle buttons for the shuffle, repeat one, repeat all functions. * reimplement enable/disable item * create a new 'tool' button (see the gear button in the Finder window) for 'actions' (adding service discovery, other views, new node/playlist, save node/playlist) stuff like that @@ -50,10 +49,10 @@ #import "controls.h" #import "vlc_osd.h" #import "misc.h" -#import +#import /***************************************************************************** - * VLCPlaylistView implementation + * VLCPlaylistView implementation *****************************************************************************/ @implementation VLCPlaylistView @@ -82,8 +81,7 @@ case NSEnterCharacter: case NSCarriageReturnCharacter: - [(VLCPlaylist *)[[VLCMain sharedInstance] getPlaylist] - playItem:self]; + [(VLCPlaylist *)[[VLCMain sharedInstance] getPlaylist] playItem:self]; break; default: @@ -94,7 +92,6 @@ @end - /***************************************************************************** * VLCPlaylistCommon implementation * @@ -118,6 +115,7 @@ [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]; @@ -151,29 +149,19 @@ int i_return = 0; playlist_item_t *p_item = NULL; playlist_t * p_playlist = pl_Yield( VLCIntf ); - if( outlineView != o_outline_view ) - { - vlc_object_release( p_playlist ); - return 0; - } + assert( outlineView == o_outline_view ); - if( item == nil ) - { - /* root object */ + if( !item ) p_item = p_playlist->p_root_category; - } else - { p_item = (playlist_item_t *)[item pointerValue]; - } + if( p_item ) - i_return = p_item->i_children; - vlc_object_release( p_playlist ); + i_return = p_item->i_children; - if( i_return <= 0 ) - i_return = 0; -NSLog( @"%d children for %s", i_return, p_item->p_input->psz_name ); - return i_return; + pl_Release( VLCIntf ); + + return i_return > 0 ? i_return : 0; } /* return the child at index for the Obj-C pointer item */ /* DONE */ @@ -190,21 +178,21 @@ NSLog( @"%d children for %s", i_return, p_item->p_input->psz_name ); } else { - p_item = (playlist_item_t *)[item pointerValue]; + p_item = (playlist_item_t *)[item pointerValue]; } if( p_item && index < p_item->i_children && index >= 0 ) p_return = p_item->pp_children[index]; - + vlc_object_release( p_playlist ); o_value = [o_outline_dict objectForKey:[NSString stringWithFormat: @"%p", p_return]]; - #if 0 - NSLog( @"%s", p_return->p_input->psz_name); - #endif + if( o_value == nil ) { + /* 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]; - msg_Err( VLCIntf, "missing playlist item's pointer value" ); } return o_value; } @@ -229,64 +217,91 @@ NSLog( @"%d children for %s", i_return, p_item->p_input->psz_name ); if( p_item ) i_return = p_item->i_children; } - vlc_object_release( p_playlist ); + pl_Release( VLCIntf ); -NSLog( @"expandable" ); - if( i_return <= 0 ) - return NO; - else - return YES; + return (i_return >= 0); } /* retrieve the string values for the cells */ - (id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTableColumn *)o_tc byItem:(id)item { id o_value = nil; - intf_thread_t *p_intf = VLCIntf; playlist_item_t *p_item; - - if( item == nil || ![item isKindOfClass: [NSValue class]] ) return( @"error" ); - + + /* For error handling */ + static BOOL attempted_reload = NO; + + if( item == nil || ![item isKindOfClass: [NSValue class]] ) + { + /* Attempt to fix the error by asking for a data redisplay + * This might cause infinite loop, so add a small check */ + if( !attempted_reload ) + { + attempted_reload = YES; + [outlineView reloadData]; + } + return @"error" ; + } + p_item = (playlist_item_t *)[item pointerValue]; - if( p_item == NULL ) + if( !p_item || !p_item->p_input ) { - return( @"error"); + /* Attempt to fix the error by asking for a data redisplay + * This might cause infinite loop, so add a small check */ + if( !attempted_reload ) + { + attempted_reload = YES; + [outlineView reloadData]; + } + return @"error"; } -//NSLog( @"values for %p", p_item ); - - if( [[o_tc identifier] isEqualToString:@"1"] ) + + attempted_reload = NO; + + if( [[o_tc identifier] isEqualToString:@"name"] ) { - o_value = [NSString stringWithUTF8String: - p_item->p_input->psz_name]; - if( o_value == NULL ) - o_value = [NSString stringWithCString: - p_item->p_input->psz_name]; + /* sanity check to prevent the NSString class from crashing */ + char *psz_title = input_item_GetTitle( p_item->p_input ); + if( !EMPTY_STR( psz_title ) ) + { + o_value = [NSString stringWithUTF8String: psz_title]; + } + else + { + char *psz_name = input_item_GetName( p_item->p_input ); + if( psz_name ) + o_value = [NSString stringWithUTF8String: psz_name]; + free( psz_name ); + } + free( psz_title ); } - else if( [[o_tc identifier] isEqualToString:@"2"] && p_item->p_input->p_meta && - p_item->p_input->p_meta->psz_artist && *p_item->p_input->p_meta->psz_artist ) + else if( [[o_tc identifier] isEqualToString:@"artist"] ) { - o_value = [NSString stringWithUTF8String: - p_item->p_input->p_meta->psz_artist]; - if( o_value == NULL ) - o_value = [NSString stringWithCString: - p_item->p_input->p_meta->psz_artist]; + char *psz_artist = input_item_GetArtist( p_item->p_input ); + if( psz_artist ) + o_value = [NSString stringWithUTF8String: psz_artist]; + free( psz_artist ); } - else if( [[o_tc identifier] isEqualToString:@"3"] ) + else if( [[o_tc identifier] isEqualToString:@"duration"] ) { char psz_duration[MSTRTIME_MAX_SIZE]; - mtime_t dur = p_item->p_input->i_duration; + 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 = @"--:--"; + } + else if( [[o_tc identifier] isEqualToString:@"status"] ) + { + if( input_ItemHasErrorWhenReading( p_item->p_input ) ) { - o_value = @"-:--:--"; + o_value = [NSImage imageWithWarningIcon]; } } - - return( o_value ); + return o_value; } @end @@ -337,13 +352,18 @@ NSLog( @"expandable" ); return self; } +- (void)dealloc +{ + [o_nodes_array release]; + [o_items_array release]; + [super dealloc]; +} + - (void)awakeFromNib { playlist_t * p_playlist = pl_Yield( VLCIntf ); - vlc_list_t *p_list = vlc_list_find( p_playlist, VLC_OBJECT_MODULE, - FIND_ANYWHERE ); - int i_index; + int i; [super awakeFromNib]; @@ -354,56 +374,56 @@ NSLog( @"expandable" ); @"VLCPlaylistItemPboardType", nil]]; [o_outline_view setIntercellSpacing: NSMakeSize (0.0, 1.0)]; - /* this uses private Apple API which works fine until 10.4, - * but keep checking in the future! + /* This uses private Apple API which works fine until 10.5. + * We need to keep checking in the future! * These methods are being added artificially to NSOutlineView's interface above */ o_ascendingSortingImage = [[NSOutlineView class] _defaultTableHeaderSortImage]; o_descendingSortingImage = [[NSOutlineView class] _defaultTableHeaderReverseSortImage]; o_tc_sortColumn = nil; - for( i_index = 0; i_index < p_list->i_count; i_index++ ) + char ** ppsz_name; + char ** ppsz_services = services_discovery_GetServicesNames( p_playlist, &ppsz_name ); + if( !ppsz_services ) { - NSMenuItem * o_lmi; - module_t * p_parser = (module_t *)p_list->p_values[i_index].p_object ; - - if( !strcmp( p_parser->psz_capability, "services_discovery" ) ) - { - /* create the menu entries used in the playlist menu */ - o_lmi = [[o_mi_services submenu] addItemWithTitle: - [NSString stringWithUTF8String: - p_parser->psz_longname ? p_parser->psz_longname : - ( p_parser->psz_shortname ? p_parser->psz_shortname: - p_parser->psz_object_name)] - action: @selector(servicesChange:) - keyEquivalent: @""]; - [o_lmi setTarget: self]; - [o_lmi setRepresentedObject: - [NSString stringWithCString: p_parser->psz_object_name]]; - if( playlist_IsServicesDiscoveryLoaded( p_playlist, - p_parser->psz_object_name ) ) - [o_lmi setState: NSOnState]; - - /* create the menu entries for the main menu */ - o_lmi = [[o_mm_mi_services submenu] addItemWithTitle: - [NSString stringWithUTF8String: - p_parser->psz_longname ? p_parser->psz_longname : - ( p_parser->psz_shortname ? p_parser->psz_shortname: - p_parser->psz_object_name)] - action: @selector(servicesChange:) - keyEquivalent: @""]; - [o_lmi setTarget: self]; - [o_lmi setRepresentedObject: - [NSString stringWithCString: p_parser->psz_object_name]]; - if( playlist_IsServicesDiscoveryLoaded( p_playlist, - p_parser->psz_object_name ) ) - [o_lmi setState: NSOnState]; - } + vlc_object_release( p_playlist ); + return; } - vlc_list_release( p_list ); - vlc_object_release( p_playlist ); + + for( i = 0; ppsz_services[i]; i++ ) + { + bool b_enabled; + 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, ppsz_services[i] ); + + /* Create the menu entries used in the playlist menu */ + o_lmi = [[o_mi_services submenu] addItemWithTitle: + [NSString stringWithUTF8String: name] + action: @selector(servicesChange:) + keyEquivalent: @""]; + [o_lmi setTarget: self]; + [o_lmi setRepresentedObject: [NSString stringWithUTF8String: ppsz_services[i]]]; + if( b_enabled ) [o_lmi setState: NSOnState]; + + /* Create the menu entries for the main menu */ + o_lmi = [[o_mm_mi_services submenu] addItemWithTitle: + [NSString stringWithUTF8String: name] + action: @selector(servicesChange:) + keyEquivalent: @""]; + [o_lmi setTarget: self]; + [o_lmi setRepresentedObject: [NSString stringWithUTF8String: ppsz_services[i]]]; + if( b_enabled ) [o_lmi setState: NSOnState]; + + free( ppsz_services[i] ); + free( ppsz_name[i] ); + } + free( ppsz_services ); + free( ppsz_name ); - //[self playlistUpdated]; + vlc_object_release( p_playlist ); } - (void)searchfieldChanged:(NSNotification *)o_notification @@ -420,17 +440,13 @@ NSLog( @"expandable" ); [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")]; - [o_status_field setStringValue: [NSString stringWithFormat: - _NS("No items in the playlist")]]; + [o_status_field setStringValue: _NS("No items in the playlist")]; -#if 0 - [o_search_button setTitle: _NS("Search")]; -#endif [o_search_field setToolTip: _NS("Search in Playlist")]; [o_mi_addNode setTitle: _NS("Add Folder to Playlist")]; @@ -441,10 +457,8 @@ NSLog( @"expandable" ); - (void)playlistUpdated { - unsigned int i; - /* Clear indications of any existing column sorting */ - for( i = 0 ; i < [[o_outline_view tableColumns] count] ; i++ ) + for( unsigned int i = 0 ; i < [[o_outline_view tableColumns] count] ; i++ ) { [o_outline_view setIndicatorImage:nil inTableColumn: [[o_outline_view tableColumns] objectAtIndex:i]]; @@ -460,55 +474,65 @@ NSLog( @"expandable" ); playlist_t *p_playlist = pl_Yield( VLCIntf ); - if( p_playlist->i_size >= 2 ) + if( playlist_CurrentSize( p_playlist ) >= 2 ) { [o_status_field setStringValue: [NSString stringWithFormat: - _NS("%i items in the playlist"), p_playlist->i_size]]; + _NS("%i items"), + playlist_CurrentSize( p_playlist )]]; } else { - if( p_playlist->i_size == 0 ) - { + 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 { playlist_t *p_playlist = pl_Yield( VLCIntf ); - vlc_value_t val, val2; - var_Get( p_playlist, "loop", &val2 ); - var_Get( p_playlist, "repeat", &val ); - if( val.b_bool == VLC_TRUE ) - { + bool loop = var_GetBool( p_playlist, "loop" ); + bool repeat = var_GetBool( p_playlist, "repeat" ); + if( repeat ) [[[VLCMain sharedInstance] getControls] repeatOne]; - } - else if( val2.b_bool == VLC_TRUE ) - { + else if( loop ) [[[VLCMain sharedInstance] getControls] repeatAll]; - } else - { [[[VLCMain sharedInstance] getControls] repeatOff]; - } [[[VLCMain sharedInstance] getControls] shuffle]; 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]; @@ -525,14 +549,6 @@ NSLog( @"expandable" ); { [o_array insertObject: [NSValue valueWithPointer: p_temp_item] atIndex: 0]; p_temp_item = p_temp_item->p_parent; - /*for (i = 0 ; i < p_temp_item->i_parents ; i++) - { - if( p_temp_item->pp_parents[i]->i_view == i_current_view ) - { - p_temp_item = p_temp_item->pp_parents[i]->p_parent; - break; - } - }*/ } for( j = 0; j < [o_array count] - 1; j++ ) @@ -547,25 +563,19 @@ NSLog( @"expandable" ); } - i_row = [o_outline_view rowForItem:[o_outline_dict - objectForKey:[NSString stringWithFormat: @"%p", p_item]]]; - - [o_outline_view selectRow: i_row byExtendingSelection: NO]; - [o_outline_view scrollRowToVisible: i_row]; - 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 ); @@ -586,20 +596,20 @@ NSLog( @"expandable" ); if ( p_temp_item ) { int i; - vlc_mutex_lock( &p_playlist->object_lock ); + if(!b_locked) PL_LOCK; if( b_check ) { /* Since outlineView: willDisplayCell:... may call this function with p_items that don't exist anymore, first check if the item is still in the playlist. Any cleaner solution welcomed. */ - for( i = 0; i < p_playlist->i_all_size; i++ ) + for( i = 0; i < p_playlist->all_items.i_size; i++ ) { - if( p_playlist->pp_all_items[i] == p_item ) break; - else if ( i == p_playlist->i_all_size - 1 ) + 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 ); - vlc_mutex_unlock( &p_playlist->object_lock ); return NO; } } @@ -610,18 +620,25 @@ NSLog( @"expandable" ); p_temp_item = p_temp_item->p_parent; if( p_temp_item == p_node ) { - vlc_mutex_unlock( &p_playlist->object_lock ); - vlc_object_release( p_playlist ); - return YES; + if(!b_locked) PL_UNLOCK; + vlc_object_release( p_playlist ); + return YES; } } - vlc_mutex_unlock( &p_playlist->object_lock ); + 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 @@ -637,7 +654,7 @@ NSLog( @"expandable" ); } 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 @@ -647,13 +664,11 @@ NSLog( @"expandable" ); } } } - } - (IBAction)savePlaylist:(id)sender { - intf_thread_t * p_intf = VLCIntf; - playlist_t * p_playlist = pl_Yield( p_intf ); + playlist_t * p_playlist = pl_Yield( VLCIntf ); NSSavePanel *o_save_panel = [NSSavePanel savePanel]; NSString * o_name = [NSString stringWithFormat: @"%@", _NS("Untitled")]; @@ -684,8 +699,8 @@ NSLog( @"expandable" ); { o_real_filename = o_filename; } - playlist_Export( p_playlist, - [o_real_filename fileSystemRepresentation], + playlist_Export( p_playlist, + [o_real_filename fileSystemRepresentation], p_playlist->p_local_category, "export-xspf" ); } else @@ -704,7 +719,7 @@ NSLog( @"expandable" ); { o_real_filename = o_filename; } - playlist_Export( p_playlist, + playlist_Export( p_playlist, [o_real_filename fileSystemRepresentation], p_playlist->p_local_category, "export-m3u" ); } @@ -742,7 +757,7 @@ NSLog( @"expandable" ); p_item = NULL; } } - playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, p_node, p_item ); + playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, pl_Unlocked, p_node, p_item ); } vlc_object_release( p_playlist ); } @@ -754,7 +769,7 @@ NSLog( @"expandable" ); NSMutableArray *o_to_preparse; intf_thread_t * p_intf = VLCIntf; playlist_t * p_playlist = pl_Yield( p_intf ); - + o_to_preparse = [NSMutableArray arrayWithArray:[[o_outline_view selectedRowEnumerator] allObjects]]; i_count = [o_to_preparse count]; @@ -778,7 +793,7 @@ NSLog( @"expandable" ); } else { - msg_Dbg( p_intf, "preparse of nodes not yet implemented" ); + msg_Dbg( p_intf, "preparsing nodes not implemented" ); } } } @@ -791,13 +806,13 @@ NSLog( @"expandable" ); NSMenuItem *o_mi = (NSMenuItem *)sender; NSString *o_string = [o_mi representedObject]; playlist_t * p_playlist = pl_Yield( VLCIntf ); - if( !playlist_IsServicesDiscoveryLoaded( p_playlist, [o_string cString] ) ) - playlist_ServicesDiscoveryAdd( p_playlist, [o_string cString] ); + if( !playlist_IsServicesDiscoveryLoaded( p_playlist, [o_string UTF8String] ) ) + playlist_ServicesDiscoveryAdd( p_playlist, [o_string UTF8String] ); else - playlist_ServicesDiscoveryRemove( p_playlist, [o_string cString] ); + playlist_ServicesDiscoveryRemove( p_playlist, [o_string UTF8String] ); [o_mi setState: playlist_IsServicesDiscoveryLoaded( p_playlist, - [o_string cString] ) ? YES : NO]; + [o_string UTF8String] ) ? YES : NO]; vlc_object_release( p_playlist ); [self playlistUpdated]; @@ -811,48 +826,49 @@ NSLog( @"expandable" ); - (IBAction)deleteItem:(id)sender { - int i, i_count, i_row; + int i_count, i_row; NSMutableArray *o_to_delete; NSNumber *o_number; playlist_t * p_playlist; intf_thread_t * p_intf = VLCIntf; - p_playlist = pl_Yield( p_intf ); - o_to_delete = [NSMutableArray arrayWithArray:[[o_outline_view selectedRowEnumerator] allObjects]]; i_count = [o_to_delete count]; - for( i = 0; i < i_count; i++ ) + p_playlist = pl_Yield( p_intf ); + + PL_LOCK; + for( int i = 0; i < i_count; i++ ) { o_number = [o_to_delete lastObject]; i_row = [o_number intValue]; id o_item = [o_outline_view itemAtRow: i_row]; playlist_item_t *p_item = [o_item pointerValue]; +#ifndef NDEBUG + msg_Dbg( p_intf, "deleting item %i (of %i) with id \"%i\", pointerValue \"%p\" and %i children", i+1, i_count, + p_item->p_input->i_id, [o_item pointerValue], p_item->i_children +1 ); +#endif [o_to_delete removeObject: o_number]; [o_outline_view deselectRow: i_row]; - if( [[o_outline_view dataSource] outlineView:o_outline_view - numberOfChildrenOfItem: o_item] > 0 ) + 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: ((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 ); - } - vlc_mutex_lock( &p_playlist->object_lock ); - playlist_NodeDelete( p_playlist, p_item, VLC_TRUE, VLC_FALSE ); - vlc_mutex_unlock( &p_playlist->object_lock ); + playlist_Control(p_playlist, PLAYLIST_STOP, pl_Locked ); + + playlist_NodeDelete( p_playlist, p_item, true, false ); } else - { - playlist_LockDelete( p_playlist, p_item->i_id ); - } + playlist_DeleteFromInput( p_playlist, p_item->p_input->i_id, pl_Locked ); } + PL_UNLOCK; + [self playlistUpdated]; vlc_object_release( p_playlist ); } @@ -874,8 +890,7 @@ NSLog( @"expandable" ); if( [o_outline_view selectedRow] > -1 ) { - p_item = [[o_outline_view itemAtRow: [o_outline_view selectedRow]] - pointerValue]; + p_item = [[o_outline_view itemAtRow: [o_outline_view selectedRow]] pointerValue]; } else /*If no item is selected, sort the whole playlist*/ @@ -885,16 +900,16 @@ NSLog( @"expandable" ); if( p_item->i_children > -1 ) // the item is a node { - vlc_mutex_lock( &p_playlist->object_lock ); + PL_LOCK; playlist_RecursiveNodeSort( p_playlist, p_item, i_mode, ORDER_NORMAL ); - vlc_mutex_unlock( &p_playlist->object_lock ); + PL_UNLOCK; } else { - vlc_mutex_lock( &p_playlist->object_lock ); + PL_LOCK; playlist_RecursiveNodeSort( p_playlist, p_item->p_parent, i_mode, ORDER_NORMAL ); - vlc_mutex_unlock( &p_playlist->object_lock ); + PL_UNLOCK; } vlc_object_release( p_playlist ); [self playlistUpdated]; @@ -917,7 +932,7 @@ NSLog( @"expandable" ); o_name = (NSString *)[o_one_item objectForKey: @"ITEM_NAME"]; o_options = (NSArray *)[o_one_item objectForKey: @"ITEM_OPTIONS"]; - /* Find the name for a disc entry ( i know, can you believe the trouble?) */ + /* Find the name for a disc entry (i know, can you believe the trouble?) */ if( ( !o_name || [o_name isEqualToString:@""] ) && [o_uri rangeOfString: @"/dev/"].location != NSNotFound ) { int i_count, i_index; @@ -929,14 +944,14 @@ NSLog( @"expandable" ); { NSMutableString *o_temp, *o_temp2; o_temp = [NSMutableString stringWithString: o_uri]; - o_temp2 = [NSMutableString stringWithCString: mounts[i_index].f_mntfromname]; - [o_temp replaceOccurrencesOfString: @"/dev/rdisk" withString: @"/dev/disk" options:nil range:NSMakeRange(0, [o_temp length]) ]; - [o_temp2 replaceOccurrencesOfString: @"s0" withString: @"" options:nil range:NSMakeRange(0, [o_temp2 length]) ]; - [o_temp2 replaceOccurrencesOfString: @"s1" withString: @"" options:nil range:NSMakeRange(0, [o_temp2 length]) ]; + o_temp2 = [NSMutableString stringWithUTF8String: mounts[i_index].f_mntfromname]; + [o_temp replaceOccurrencesOfString: @"/dev/rdisk" withString: @"/dev/disk" options:NSLiteralSearch range:NSMakeRange(0, [o_temp length]) ]; + [o_temp2 replaceOccurrencesOfString: @"s0" withString: @"" options:NSLiteralSearch range:NSMakeRange(0, [o_temp2 length]) ]; + [o_temp2 replaceOccurrencesOfString: @"s1" withString: @"" options:NSLiteralSearch range:NSMakeRange(0, [o_temp2 length]) ]; if( strstr( [o_temp fileSystemRepresentation], [o_temp2 fileSystemRepresentation] ) != NULL ) { - o_name = [[NSFileManager defaultManager] displayNameAtPath: [NSString stringWithCString:mounts[i_index].f_mntonname]]; + o_name = [[NSFileManager defaultManager] displayNameAtPath: [NSString stringWithUTF8String:mounts[i_index].f_mntonname]]; } } } @@ -956,10 +971,10 @@ NSLog( @"expandable" ); buf = (struct statfs *) malloc (sizeof(struct statfs)); statfs( [o_uri fileSystemRepresentation], buf ); psz_dev = strdup(buf->f_mntfromname); - o_temp = [NSMutableString stringWithCString: psz_dev ]; - [o_temp replaceOccurrencesOfString: @"/dev/disk" withString: @"/dev/rdisk" options:nil range:NSMakeRange(0, [o_temp length]) ]; - [o_temp replaceOccurrencesOfString: @"s0" withString: @"" options:nil range:NSMakeRange(0, [o_temp length]) ]; - [o_temp replaceOccurrencesOfString: @"s1" withString: @"" options:nil range:NSMakeRange(0, [o_temp length]) ]; + o_temp = [NSMutableString stringWithUTF8String: psz_dev ]; + [o_temp replaceOccurrencesOfString: @"/dev/disk" withString: @"/dev/rdisk" options:NSLiteralSearch range:NSMakeRange(0, [o_temp length]) ]; + [o_temp replaceOccurrencesOfString: @"s0" withString: @"" options:NSLiteralSearch range:NSMakeRange(0, [o_temp length]) ]; + [o_temp replaceOccurrencesOfString: @"s1" withString: @"" options:NSLiteralSearch range:NSMakeRange(0, [o_temp length]) ]; o_uri = o_temp; } @@ -977,7 +992,7 @@ NSLog( @"expandable" ); /* Recent documents menu */ o_true_file = [NSURL fileURLWithPath: o_uri]; - if( o_true_file != nil ) + if( o_true_file != nil && (BOOL)config_GetInt( p_playlist, "macosx-recentitems" ) == YES ) { [[NSDocumentController sharedDocumentController] noteNewRecentDocumentURL: o_true_file]; @@ -992,6 +1007,7 @@ NSLog( @"expandable" ); 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; @@ -1006,22 +1022,22 @@ NSLog( @"expandable" ); } /* Add the item */ - playlist_PlaylistAddInput( p_playlist, p_input, PLAYLIST_INSERT, - i_position == -1 ? PLAYLIST_END : i_position + i_item ); + /* FIXME: playlist_AddInput() can fail */ + + playlist_AddInput( p_playlist, p_input, PLAYLIST_INSERT, + i_position == -1 ? PLAYLIST_END : i_position + i_item, true, + pl_Locked ); if( i_item == 0 && !b_enqueue ) { playlist_item_t *p_item; - p_item = playlist_ItemGetByInput( p_playlist, p_input ); - playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, NULL, p_item ); - } - else - { - playlist_item_t *p_item; - p_item = playlist_ItemGetByInput( p_playlist, p_input ); - playlist_Control( p_playlist, PLAYLIST_PREPARSE, 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 ); } @@ -1039,30 +1055,27 @@ NSLog( @"expandable" ); /* 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 */ - 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 ); + 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 ); - playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, NULL, p_item ); - } - else - { - playlist_item_t *p_item; - p_item = playlist_ItemGetByInput( p_playlist, p_input ); - playlist_Control( p_playlist, PLAYLIST_PREPARSE, 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]; vlc_object_release( p_playlist ); @@ -1086,14 +1099,14 @@ NSLog( @"expandable" ); char *psz_temp; NSString *o_current_name, *o_current_author; - vlc_mutex_lock( &p_playlist->object_lock ); + 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 , _("Meta-information"),_("Artist") ); o_current_author = [NSString stringWithUTF8String: psz_temp]; free( psz_temp); - vlc_mutex_unlock( &p_playlist->object_lock ); + PL_UNLOCK; if( p_selected_item == p_item->pp_children[i_current] && b_selected_item_met == NO ) @@ -1108,9 +1121,9 @@ NSLog( @"expandable" ); } else if( b_selected_item_met == YES && ( [o_current_name rangeOfString:[o_search_field - stringValue] options:NSCaseInsensitiveSearch ].length || + stringValue] options:NSCaseInsensitiveSearch].length || [o_current_author rangeOfString:[o_search_field - stringValue] options:NSCaseInsensitiveSearch ].length ) ) + stringValue] options:NSCaseInsensitiveSearch].length ) ) { vlc_object_release( p_playlist ); /*Adds the parent items in the result array as well, so that we can @@ -1202,13 +1215,16 @@ NSLog( @"expandable" ); - (NSMenu *)menuForEvent:(NSEvent *)o_event { NSPoint pt; - vlc_bool_t b_rows; - vlc_bool_t b_item_sel; + bool b_rows; + bool b_item_sel; 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]; @@ -1245,7 +1261,7 @@ NSLog( @"expandable" ); } else { - b_isSortDescending = VLC_FALSE; + b_isSortDescending = false; } if( o_tc == o_tc_name ) @@ -1266,9 +1282,9 @@ NSLog( @"expandable" ); 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]; @@ -1305,11 +1321,11 @@ NSLog( @"expandable" ); [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 ); } @@ -1319,7 +1335,7 @@ NSLog( @"expandable" ); /* we have to create a new thread here because otherwise we would block the * interface since the interaction-stuff and this code would run in the same * thread */ - [NSThread detachNewThreadSelector: @selector(addNodeThreadedly) + [NSThread detachNewThreadSelector: @selector(addNodeThreadedly) toTarget: self withObject:nil]; [self playlistUpdated]; } @@ -1334,20 +1350,25 @@ NSLog( @"expandable" ); int ret_v; char *psz_name = NULL; - playlist_item_t * p_item; - ret_v = intf_UserStringInput( p_playlist, _("New Node"), + ret_v = intf_UserStringInput( p_playlist, _("New Node"), _("Please enter a name for the new node."), &psz_name ); - if( psz_name != NULL && psz_name != "" ) - p_item = playlist_NodeCreate( p_playlist, psz_name, - p_playlist->p_local_category ); - else - p_item = playlist_NodeCreate( p_playlist, _("Empty Folder"), - p_playlist->p_local_category ); - if(! p_item ) - msg_Warn( VLCIntf, "node creation failed" ); + 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 */ + playlist_NodeCreate( p_playlist, _("Empty Folder"), + p_playlist->p_local_category, 0, NULL ); + } + PL_UNLOCK; - vlc_object_release( p_playlist ); + free( psz_name ); + pl_Release( VLCIntf ); [ourPool release]; } @@ -1360,30 +1381,27 @@ NSLog( @"expandable" ); id o_value = [super outlineView: outlineView child: index ofItem: item]; playlist_t *p_playlist = pl_Yield( VLCIntf ); - /* FIXME: playlist->i_size doesn't provide the correct number of items anymore - * check the playlist API for the fixed function, once zorglub implemented it -- fpk, 9/17/06 */ - - if( p_playlist->i_size >= 2 ) + if( playlist_CurrentSize( p_playlist ) >= 2 ) { [o_status_field setStringValue: [NSString stringWithFormat: - _NS("%i items in the playlist"), p_playlist->i_size]]; + _NS("%i items"), + playlist_CurrentSize( p_playlist )]]; } else { - if( p_playlist->i_size == 0 ) + 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 ); [o_outline_dict setObject:o_value forKey:[NSString stringWithFormat:@"%p", [o_value pointerValue]]]; - msg_Dbg( VLCIntf, "adding item %p", [o_value pointerValue] ); return o_value; } @@ -1406,7 +1424,10 @@ NSLog( @"expandable" ); /* Refuse to move items that are not in the General Node (Service Discovery) */ if( ![self isItem: [o_item pointerValue] inNode: - p_playlist->p_local_category checkItemExistence: NO]) + p_playlist->p_local_category checkItemExistence: NO] && + ( var_CreateGetBool( p_playlist, "media-library" ) && + ![self isItem: [o_item pointerValue] inNode: + p_playlist->p_ml_category checkItemExistence: NO]) ) { vlc_object_release(p_playlist); return NO; @@ -1452,11 +1473,18 @@ NSLog( @"expandable" ); } } + /* Don't allow on drop on playlist root element's child */ + if( !item && index != NSOutlineViewDropOnItemIndex) + { + vlc_object_release( p_playlist ); + return NSDragOperationNone; + } + /* We refuse to drop an item in anything else than a child of the General Node. We still accept items that would be root nodes of the outlineview however, to allow drop in an empty playlist. */ - if( !([self isItem: [item pointerValue] inNode: p_playlist->p_local_category - checkItemExistence: NO] || item == nil) ) + if( !( ([self isItem: [item pointerValue] inNode: p_playlist->p_local_category checkItemExistence: NO] || + ( var_CreateGetBool( p_playlist, "media-library" ) && [self isItem: [item pointerValue] inNode: p_playlist->p_ml_category checkItemExistence: NO] ) ) || item == nil ) ) { vlc_object_release( p_playlist ); return NSDragOperationNone; @@ -1541,8 +1569,8 @@ NSLog( @"expandable" ); } } - vlc_mutex_lock( &p_playlist->object_lock ); - // Acually detach the item from the old position + PL_LOCK; + // Actually detach the item from the old position if( playlist_NodeRemoveItem( p_playlist, p_item, p_old_parent ) == VLC_SUCCESS ) { @@ -1564,7 +1592,7 @@ NSLog( @"expandable" ); // Reattach the item to the new position playlist_NodeInsert( p_playlist, p_item, p_new_parent, i_new_index ); } - vlc_mutex_unlock( &p_playlist->object_lock ); + PL_UNLOCK; } [self playlistUpdated]; i_row = [o_outline_view rowForItem:[o_outline_dict @@ -1606,18 +1634,13 @@ NSLog( @"expandable" ); 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; @@ -1625,13 +1648,6 @@ NSLog( @"expandable" ); vlc_object_release( p_playlist ); return NO; } - -/* Delegate method of NSWindow */ -/*- (void)windowWillClose:(NSNotification *)aNotification -{ - [o_btn_playlist setState: NSOffState]; -} -*/ @end