X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fplaylist.m;h=e80c9b33bc8124b5543e09cd9497580958a9eba9;hb=966d42293a5613a3ce2b55e5e516533680ff2738;hp=7ffa25e9bd846b8aaa24632dbfeecbc83e02a953;hpb=898c67b21302c4a822c70be130097566b36aa09c;p=vlc diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m index 7ffa25e9bd..e80c9b33bc 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-2008 the VideoLAN team +* Copyright (C) 2002-2009 the VideoLAN team * $Id$ * * Authors: Jon Lech Johansen @@ -49,7 +49,9 @@ #import "controls.h" #import "vlc_osd.h" #import "misc.h" +#import "sidebarview.h" #import +#import /***************************************************************************** * VLCPlaylistView implementation @@ -81,7 +83,7 @@ case NSEnterCharacter: case NSCarriageReturnCharacter: - [(VLCPlaylist *)[[VLCMain sharedInstance] getPlaylist] playItem:self]; + [(VLCPlaylist *)[[VLCMain sharedInstance] playlist] playItem:self]; break; default: @@ -111,12 +113,19 @@ } - (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 ); + [o_outline_view_other setTarget: self]; + [o_outline_view_other setDelegate: self]; + [o_outline_view_other setDataSource: self]; + [o_outline_view_other setAllowsEmptySelection: NO]; + + pl_Release( VLCIntf ); [self initStrings]; } @@ -125,6 +134,29 @@ [[o_tc_name headerCell] setStringValue:_NS("Name")]; [[o_tc_author headerCell] setStringValue:_NS("Author")]; [[o_tc_duration headerCell] setStringValue:_NS("Duration")]; + + [[o_tc_name_other headerCell] setStringValue:_NS("Name")]; + [[o_tc_author_other headerCell] setStringValue:_NS("Author")]; + [[o_tc_duration_other headerCell] setStringValue:_NS("Duration")]; +} + +- (void)swapPlaylists:(id)newList +{ + if(newList != o_outline_view) + { + id o_outline_view_temp = o_outline_view; + id o_tc_author_temp = o_tc_author; + id o_tc_duration_temp = o_tc_duration; + id o_tc_name_temp = o_tc_name; + o_outline_view = o_outline_view_other; + o_tc_author = o_tc_author_other; + o_tc_duration = o_tc_duration_other; + o_tc_name = o_tc_name_other; + o_outline_view_other = o_outline_view_temp; + o_tc_author_other = o_tc_author_temp; + o_tc_duration_other = o_tc_duration_temp; + o_tc_name_other = o_tc_name_temp; + } } - (NSOutlineView *)outlineView @@ -143,12 +175,12 @@ @implementation VLCPlaylistCommon (NSOutlineViewDataSource) /* return the number of children for Obj-C pointer item */ /* DONE */ -- (int)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item +- (NSInteger)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item { 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; @@ -164,12 +196,13 @@ } /* return the child at index for the Obj-C pointer item */ /* DONE */ -- (id)outlineView:(NSOutlineView *)outlineView child:(int)index ofItem:(id)item +- (id)outlineView:(NSOutlineView *)outlineView child:(NSInteger)index ofItem:(id)item { 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 +214,17 @@ } if( p_item && index < p_item->i_children && index >= 0 ) p_return = p_item->pp_children[index]; - - vlc_object_release( p_playlist ); + PL_UNLOCK; + + pl_Release( VLCIntf ); 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" ); + /* FIXME: 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 +234,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 +250,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,50 +291,43 @@ 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 ); - if( !EMPTY_STR( psz_title ) ) + char *psz_title = input_item_GetTitleFbName( p_item->p_input ); + if( psz_title ) { o_value = [NSString stringWithUTF8String: psz_title]; + free( psz_title ); } - else - { - char *psz_name = input_item_GetName( p_item->p_input ); - if( !EMPTY_STR( 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,21 +378,34 @@ 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; [super awakeFromNib]; [o_outline_view setDoubleAction: @selector(playItem:)]; + [o_outline_view_other setDoubleAction: @selector(playItem:)]; [o_outline_view registerForDraggedTypes: [NSArray arrayWithObjects: NSFilenamesPboardType, @"VLCPlaylistItemPboardType", nil]]; [o_outline_view setIntercellSpacing: NSMakeSize (0.0, 1.0)]; + [o_outline_view_other registerForDraggedTypes: + [NSArray arrayWithObjects: NSFilenamesPboardType, + @"VLCPlaylistItemPboardType", nil]]; + [o_outline_view_other setIntercellSpacing: NSMakeSize (0.0, 1.0)]; + /* 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 */ @@ -373,10 +415,10 @@ 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 ); + pl_Release( VLCIntf ); return; } @@ -413,7 +455,7 @@ free( ppsz_services ); free( ppsz_name ); - vlc_object_release( p_playlist ); + pl_Release( VLCIntf ); } - (void)searchfieldChanged:(NSNotification *)o_notification @@ -430,19 +472,39 @@ [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_status_field_embed setStringValue: _NS("No items in the playlist")]; [o_search_field setToolTip: _NS("Search in Playlist")]; + [o_search_field_other setToolTip: _NS("Search in Playlist")]; [o_mi_addNode setTitle: _NS("Add Folder to Playlist")]; [o_save_accessory_text setStringValue: _NS("File Format:")]; [[o_save_accessory_popup itemAtIndex:0] setTitle: _NS("Extended M3U")]; [[o_save_accessory_popup itemAtIndex:1] setTitle: _NS("XML Shareable Playlist Format (XSPF)")]; + [[o_save_accessory_popup itemAtIndex:2] setTitle: _NS("HTML Playlist")]; +} + +- (void)swapPlaylists:(id)newList +{ + if(newList != o_outline_view) + { + id o_search_field_temp = o_search_field; + o_search_field = o_search_field_other; + o_search_field_other = o_search_field_temp; + [super swapPlaylists:newList]; + [self playlistUpdated]; + } } - (void)playlistUpdated @@ -459,43 +521,99 @@ // TODO Find a way to keep the dict size to a minimum //[o_outline_dict removeAllObjects]; [o_outline_view reloadData]; - [[[[VLCMain sharedInstance] getWizard] getPlaylistWizard] reloadOutlineView]; - [[[[VLCMain sharedInstance] getBookmarks] getDataTable] reloadData]; + [o_sidebar updateSidebar:[self playingItem]]; + [[[[VLCMain sharedInstance] wizard] playlistWizard] reloadOutlineView]; + [[[[VLCMain sharedInstance] bookmarks] dataTable] 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 )]]; + [o_status_field_embed setStringValue: [NSString stringWithFormat: + _NS("%i items"), + playlist_CurrentSize( p_playlist )]]; } else { if( playlist_IsEmpty( p_playlist ) ) + { [o_status_field setStringValue: _NS("No items in the playlist")]; + [o_status_field_embed 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")]; + [o_status_field_embed setStringValue: _NS("1 item")]; + } } - vlc_object_release( p_playlist ); + PL_UNLOCK; + pl_Release( VLCIntf ); + + [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" ); if( repeat ) - [[[VLCMain sharedInstance] getControls] repeatOne]; + [[[VLCMain sharedInstance] controls] repeatOne]; else if( loop ) - [[[VLCMain sharedInstance] getControls] repeatAll]; + [[[VLCMain sharedInstance] controls] repeatAll]; else - [[[VLCMain sharedInstance] getControls] repeatOff]; + [[[VLCMain sharedInstance] controls] repeatOff]; - [[[VLCMain sharedInstance] getControls] shuffle]; + [[[VLCMain sharedInstance] controls] shuffle]; - vlc_object_release( p_playlist ); + pl_Release( VLCIntf ); +} + +- (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] info] updatePanelWithItem:p_item->p_input]; + } + } +} + +- (BOOL)isSelectionEmpty +{ + return [o_outline_view selectedRow] == -1; } - (void)updateRowSelection @@ -503,14 +621,17 @@ 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; + PL_LOCK; + p_item = playlist_CurrentPlayingItem( p_playlist ); if( p_item == NULL ) { - vlc_object_release(p_playlist); + PL_UNLOCK; + pl_Release( VLCIntf ); return; } @@ -533,40 +654,40 @@ } - vlc_object_release( p_playlist ); - - /* update our info-panel to reflect the new item */ - [[[VLCMain sharedInstance] getInfo] updatePanel]; + PL_UNLOCK; + 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 ) { - vlc_object_release(p_playlist); + pl_Release( VLCIntf ); return YES; } if( p_node->i_children < 1) { - vlc_object_release(p_playlist); + pl_Release( VLCIntf ); return NO; } if ( p_temp_item ) { int i; - PL_LOCK; + if(!b_locked) PL_LOCK; if( b_check ) { @@ -578,8 +699,8 @@ if( ARRAY_VAL( p_playlist->all_items, i) == p_item ) break; else if ( i == p_playlist->all_items.i_size - 1 ) { - vlc_object_release( p_playlist ); - PL_UNLOCK; + if(!b_locked) PL_UNLOCK; + pl_Release( VLCIntf ); return NO; } } @@ -590,18 +711,25 @@ p_temp_item = p_temp_item->p_parent; if( p_temp_item == p_node ) { - PL_UNLOCK; - vlc_object_release( p_playlist ); + if(!b_locked) PL_UNLOCK; + pl_Release( VLCIntf ); return YES; } } - PL_UNLOCK; + if(!b_locked) PL_UNLOCK; } - vlc_object_release( p_playlist ); + pl_Release( VLCIntf ); 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 @@ -617,7 +745,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 @@ -627,17 +755,15 @@ } } } - } - (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")]; - //[o_save_panel setAllowedFileTypes: [NSArray arrayWithObjects: @"m3u", @"xpf", nil] ]; [o_save_panel setTitle: _NS("Save Playlist")]; [o_save_panel setPrompt: _NS("Save")]; [o_save_panel setAccessoryView: o_save_accessory_view]; @@ -647,7 +773,27 @@ { NSString *o_filename = [o_save_panel filename]; - if( [o_save_accessory_popup indexOfSelectedItem] == 1 ) + if( [o_save_accessory_popup indexOfSelectedItem] == 0 ) + { + NSString * o_real_filename; + NSRange range; + range.location = [o_filename length] - [@".m3u" length]; + range.length = [@".m3u" length]; + + if( [o_filename compare:@".m3u" options: NSCaseInsensitiveSearch + range: range] != NSOrderedSame ) + { + o_real_filename = [NSString stringWithFormat: @"%@.m3u", o_filename]; + } + else + { + o_real_filename = o_filename; + } + playlist_Export( p_playlist, + [o_real_filename fileSystemRepresentation], + p_playlist->p_local_category, "export-m3u" ); + } + else if( [o_save_accessory_popup indexOfSelectedItem] == 1 ) { NSString * o_real_filename; NSRange range; @@ -671,13 +817,13 @@ { NSString * o_real_filename; NSRange range; - range.location = [o_filename length] - [@".m3u" length]; - range.length = [@".m3u" length]; + range.location = [o_filename length] - [@".html" length]; + range.length = [@".html" length]; - if( [o_filename compare:@".m3u" options: NSCaseInsensitiveSearch + if( [o_filename compare:@".html" options: NSCaseInsensitiveSearch range: range] != NSOrderedSame ) { - o_real_filename = [NSString stringWithFormat: @"%@.m3u", o_filename]; + o_real_filename = [NSString stringWithFormat: @"%@.html", o_filename]; } else { @@ -685,17 +831,17 @@ } playlist_Export( p_playlist, [o_real_filename fileSystemRepresentation], - p_playlist->p_local_category, "export-m3u" ); + p_playlist->p_local_category, "export-html" ); } } - vlc_object_release( p_playlist ); + pl_Release( VLCIntf ); } /* When called retrieves the selected outlineview row and plays that node or item */ - (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; @@ -721,18 +867,73 @@ 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 ); + pl_Release( p_intf ); } +- (void)playSidebarItem:(id)item +{ + intf_thread_t * p_intf = VLCIntf; + playlist_t * p_playlist = pl_Hold( p_intf ); + + playlist_item_t *p_item; + playlist_item_t *p_node = NULL; + + p_item = [item pointerValue]; + + 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_Unlocked, p_node, p_item ); + } + pl_Release( p_intf ); +} + +- (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]; @@ -753,7 +954,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 { @@ -761,7 +962,38 @@ } } } - vlc_object_release( p_playlist ); + pl_Release( p_intf ); + [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 ); + } + } + pl_Release( p_intf ); [self playlistUpdated]; } @@ -769,7 +1001,7 @@ { 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 @@ -778,7 +1010,7 @@ [o_mi setState: playlist_IsServicesDiscoveryLoaded( p_playlist, [o_string UTF8String] ) ? YES : NO]; - vlc_object_release( p_playlist ); + pl_Release( VLCIntf ); [self playlistUpdated]; return; } @@ -800,7 +1032,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++ ) @@ -819,22 +1051,22 @@ 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, pl_Locked ); } PL_UNLOCK; [self playlistUpdated]; - vlc_object_release( p_playlist ); + pl_Release( p_intf ); } - (IBAction)sortNodeByName:(id)sender @@ -849,7 +1081,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 ) @@ -875,14 +1107,14 @@ p_item->p_parent, i_mode, ORDER_NORMAL ); PL_UNLOCK; } - vlc_object_release( p_playlist ); + pl_Release( VLCIntf ); [self playlistUpdated]; } - (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; @@ -942,15 +1174,19 @@ 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; + { + pl_Release( p_intf ); + return NULL; + } if( o_options ) { 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] ), + VLC_INPUT_OPTION_TRUSTED ); } } @@ -962,15 +1198,16 @@ noteNewRecentDocumentURL: o_true_file]; } - vlc_object_release( p_playlist ); + pl_Release( p_intf ); return p_input; } - (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; @@ -986,32 +1223,43 @@ /* 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 ); + 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 ); + pl_Release( VLCIntf ); } - (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++ ) { @@ -1021,40 +1269,35 @@ /* 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 ); + playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, pl_Locked, p_node, p_item ); } + PL_UNLOCK; vlc_gc_decref( p_input ); } [self playlistUpdated]; - vlc_object_release( p_playlist ); + pl_Release( VLCIntf ); } - (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; @@ -1073,7 +1316,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); @@ -1087,7 +1330,7 @@ else if( p_selected_item == p_item->pp_children[i_current] && b_selected_item_met == YES ) { - vlc_object_release( p_playlist ); + pl_Release( VLCIntf ); return NULL; } else if( b_selected_item_met == YES && @@ -1096,7 +1339,7 @@ [o_current_author rangeOfString:[o_search_field stringValue] options:NSCaseInsensitiveSearch].length ) ) { - vlc_object_release( p_playlist ); + pl_Release( VLCIntf ); /*Adds the parent items in the result array as well, so that we can expand the tree*/ return [NSMutableArray arrayWithObject: [NSValue @@ -1108,20 +1351,20 @@ p_item->pp_children[i_current]]; if( o_result != NULL ) { - vlc_object_release( p_playlist ); + pl_Release( VLCIntf ); [o_result insertObject: [NSValue valueWithPointer: p_item->pp_children[i_current]] atIndex:0]; return o_result; } } } - vlc_object_release( p_playlist ); + pl_Release( VLCIntf ); return NULL; } - (IBAction)searchItem:(id)sender { - playlist_t * p_playlist = pl_Yield( VLCIntf ); + playlist_t * p_playlist = pl_Hold( VLCIntf ); id o_result; unsigned int i; @@ -1162,7 +1405,7 @@ [o_outline_view selectRow:i_row byExtendingSelection: NO]; [o_outline_view scrollRowToVisible: i_row]; } - vlc_object_release( p_playlist ); + pl_Release( VLCIntf ); } - (IBAction)recursiveExpandNode:(id)sender @@ -1191,8 +1434,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]; @@ -1207,19 +1453,19 @@ 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*/ if( !( o_tc == o_tc_name || o_tc == o_tc_author ) ) { - vlc_object_release( p_playlist ); + pl_Release( p_intf ); return; } @@ -1250,11 +1496,11 @@ i_type = ORDER_NORMAL; } - vlc_object_lock( p_playlist ); + PL_LOCK; playlist_RecursiveNodeSort( p_playlist, p_playlist->p_root_category, i_mode, i_type ); - vlc_object_unlock( p_playlist ); + PL_UNLOCK; - vlc_object_release( p_playlist ); + pl_Release( p_intf ); [self playlistUpdated]; o_tc_sortColumn = o_tc; @@ -1278,100 +1524,96 @@ forTableColumn:(NSTableColumn *)tableColumn item:(id)item { - playlist_t *p_playlist = pl_Yield( VLCIntf ); + playlist_t *p_playlist = pl_Hold( VLCIntf ); id o_playing_item; + PL_LOCK; o_playing_item = [o_outline_dict objectForKey: - [NSString stringWithFormat:@"%p", p_playlist->status.p_item]]; + [NSString stringWithFormat:@"%p", playlist_CurrentPlayingItem( p_playlist )]]; + PL_UNLOCK; 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 ); + pl_Release( VLCIntf ); } -- (IBAction)addNode:(id)sender +- (id)playingItem { - /* 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) - toTarget: self withObject:nil]; - [self playlistUpdated]; + playlist_t *p_playlist = pl_Hold( VLCIntf ); + + id o_playing_item; + + PL_LOCK; + o_playing_item = [o_outline_dict objectForKey: + [NSString stringWithFormat:@"%p", playlist_CurrentPlayingItem( p_playlist )]]; + PL_UNLOCK; + + pl_Release( VLCIntf ); + + return o_playing_item; } -- (void)addNodeThreadedly +- (IBAction)addNode:(id)sender { - 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, - 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"), + PL_LOCK; + 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" ); + pl_Release( VLCIntf ); - vlc_object_release( p_playlist ); - [ourPool release]; + [self playlistUpdated]; } - @end @implementation VLCPlaylist (NSOutlineViewDataSource) -- (id)outlineView:(NSOutlineView *)outlineView child:(int)index ofItem:(id)item +- (id)outlineView:(NSOutlineView *)outlineView child:(NSInteger)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 )]]; + [o_status_field_embed setStringValue: [NSString stringWithFormat: + _NS("%i items"), + playlist_CurrentSize( p_playlist )]]; } else { if( playlist_IsEmpty( p_playlist ) ) { [o_status_field setStringValue: _NS("No items in the playlist")]; + [o_status_field_embed 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")]; + [o_status_field_embed setStringValue: _NS("1 item")]; } } - vlc_object_release( p_playlist ); + PL_UNLOCK; + + pl_Release( VLCIntf ); [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; } @@ -1380,7 +1622,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 */ @@ -1395,11 +1637,13 @@ (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); + pl_Release( VLCIntf ); return NO; } /* Fill the items and nodes to move in 2 different arrays */ @@ -1421,13 +1665,13 @@ @"VLCPlaylistItemPboardType", nil] owner: self]; [pboard setData:[NSData data] forType:@"VLCPlaylistItemPboardType"]; - vlc_object_release(p_playlist); + pl_Release( VLCIntf ); return YES; } -- (NSDragOperation)outlineView:(NSOutlineView *)outlineView validateDrop:(id )info proposedItem:(id)item proposedChildIndex:(int)index +- (NSDragOperation)outlineView:(NSOutlineView *)outlineView validateDrop:(id )info proposedItem:(id)item proposedChildIndex:(NSInteger)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; @@ -1438,7 +1682,7 @@ if( index == NSOutlineViewDropOnItemIndex && ((playlist_item_t *)[item pointerValue])->i_children == -1 ) { - vlc_object_release( p_playlist ); + pl_Release( VLCIntf ); return NSDragOperationNone; } } @@ -1446,7 +1690,7 @@ /* Don't allow on drop on playlist root element's child */ if( !item && index != NSOutlineViewDropOnItemIndex) { - vlc_object_release( p_playlist ); + pl_Release( VLCIntf ); return NSDragOperationNone; } @@ -1456,7 +1700,7 @@ 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 ); + pl_Release( VLCIntf ); return NSDragOperationNone; } @@ -1471,27 +1715,27 @@ [[o_nodes_array objectAtIndex: i] pointerValue] checkItemExistence: NO] ) { - vlc_object_release( p_playlist ); + pl_Release( VLCIntf ); return NSDragOperationNone; } } - vlc_object_release( p_playlist ); + pl_Release( VLCIntf ); return NSDragOperationMove; } /* Drop from the Finder */ else if( [[o_pasteboard types] containsObject: NSFilenamesPboardType] ) { - vlc_object_release( p_playlist ); + pl_Release( VLCIntf ); return NSDragOperationGeneric; } - vlc_object_release( p_playlist ); + pl_Release( VLCIntf ); return NSDragOperationNone; } -- (BOOL)outlineView:(NSOutlineView *)outlineView acceptDrop:(id )info item:(id)item childIndex:(int)index +- (BOOL)outlineView:(NSOutlineView *)outlineView acceptDrop:(id )info item:(id)item childIndex:(NSInteger)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 */ @@ -1512,7 +1756,7 @@ (This should never be true) */ if( p_new_parent->i_children < 0 ) { - vlc_object_release( p_playlist ); + pl_Release( VLCIntf ); return NO; } @@ -1579,7 +1823,7 @@ [o_outline_view selectRow: i_row byExtendingSelection: NO]; [o_outline_view scrollRowToVisible: i_row]; - vlc_object_release( p_playlist ); + pl_Release( VLCIntf ); return YES; } @@ -1604,23 +1848,18 @@ 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 ); + pl_Release( VLCIntf ); return YES; } - vlc_object_release( p_playlist ); + pl_Release( VLCIntf ); return NO; } @end