X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fplaylist.m;h=2711930d0d2fb3d96c9fdb9994a24eeaf104985f;hb=54ee50f3519d3c95ca4c8682067569fe9e74e982;hp=57a84995884a7749953181613a887a9a4000e3dd;hpb=fa5d2c03fbeafcfb596825d07db06001e2a85643;p=vlc diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m index 57a8499588..2711930d0d 100644 --- a/modules/gui/macosx/playlist.m +++ b/modules/gui/macosx/playlist.m @@ -1,11 +1,11 @@ /***************************************************************************** * playlist.m: MacOS X interface module ***************************************************************************** -* Copyright (C) 2002-2005 VideoLAN +* Copyright (C) 2002-2005 the VideoLAN team * $Id$ * * Authors: Jon Lech Johansen - * Derk-Jan Hartman + * Derk-Jan Hartman * Benjamin Pracht * * This program is free software; you can redistribute it and/or modify @@ -92,8 +92,261 @@ @end + +/***************************************************************************** + * VLCPlaylistCommon implementation + * + * This class the superclass of the VLCPlaylist and VLCPlaylistWizard. + * It contains the common methods and elements of these 2 entities. + *****************************************************************************/ +@implementation VLCPlaylistCommon + +- (void)awakeFromNib +{ + playlist_t * p_playlist = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST, + FIND_ANYWHERE ); + i_current_view = VIEW_CATEGORY; + playlist_ViewUpdate( p_playlist, i_current_view ); + + [o_outline_view setTarget: self]; + [o_outline_view setDelegate: self]; + [o_outline_view setDataSource: self]; + + vlc_object_release( p_playlist ); + [self initStrings]; +} + +- (void)initStrings +{ + [[o_tc_name headerCell] setStringValue:_NS("Name")]; + [[o_tc_author headerCell] setStringValue:_NS("Author")]; + [[o_tc_duration headerCell] setStringValue:_NS("Duration")]; +} + +- (NSOutlineView *)outlineView +{ + return o_outline_view; +} + +- (playlist_item_t *)selectedPlaylistItem +{ + return [[o_outline_view itemAtRow: [o_outline_view selectedRow]] + pointerValue]; +} + +@end + +@implementation VLCPlaylistCommon (NSOutlineViewDataSource) + +/* return the number of children for Obj-C pointer item */ /* DONE */ +- (int)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item +{ + int i_return = 0; + playlist_t * p_playlist = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST, + FIND_ANYWHERE ); + if( p_playlist == NULL || outlineView != o_outline_view ) + return 0; + + if( item == nil ) + { + /* root object */ + playlist_view_t *p_view; + p_view = playlist_ViewFind( p_playlist, i_current_view ); + if( p_view && p_view->p_root ) + { + i_return = p_view->p_root->i_children; + if( i_current_view == VIEW_CATEGORY ) + { + i_return--; /* remove the GENERAL item from the list */ + i_return += p_playlist->p_general->i_children; /* add the items of the general node */ + } + } + } + else + { + playlist_item_t *p_item = (playlist_item_t *)[item pointerValue]; + if( p_item ) + i_return = p_item->i_children; + } + vlc_object_release( p_playlist ); + + if( i_return <= 0 ) + i_return = 0; + + return i_return; +} + +/* return the child at index for the Obj-C pointer item */ /* DONE */ +- (id)outlineView:(NSOutlineView *)outlineView child:(int)index ofItem:(id)item +{ + playlist_item_t *p_return = NULL; + playlist_t * p_playlist = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST, + FIND_ANYWHERE ); + NSValue *o_value; + + if( p_playlist == NULL ) + return nil; + + if( item == nil ) + { + /* root object */ + playlist_view_t *p_view; + p_view = playlist_ViewFind( p_playlist, i_current_view ); + if( p_view && p_view->p_root ) p_return = p_view->p_root->pp_children[index]; + + if( i_current_view == VIEW_CATEGORY ) + { + if( p_playlist->p_general->i_children && index >= 0 && index < p_playlist->p_general->i_children ) + { + p_return = p_playlist->p_general->pp_children[index]; + } + else if( p_view && p_view->p_root && index >= 0 && index - p_playlist->p_general->i_children < p_view->p_root->i_children ) + { + p_return = p_view->p_root->pp_children[index - p_playlist->p_general->i_children + 1]; + } + } + } + else + { + playlist_item_t *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 = [[NSValue valueWithPointer: p_return] retain]; + + return o_value; +} + +/* is the item expandable */ +- (BOOL)outlineView:(NSOutlineView *)outlineView isItemExpandable:(id)item +{ + int i_return = 0; + playlist_t * p_playlist = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST, + FIND_ANYWHERE ); + if( p_playlist == NULL ) + return NO; + + if( item == nil ) + { + /* root object */ + playlist_view_t *p_view; + p_view = playlist_ViewFind( p_playlist, i_current_view ); + if( p_view && p_view->p_root ) i_return = p_view->p_root->i_children; + + if( i_current_view == VIEW_CATEGORY ) + { + i_return--; + i_return += p_playlist->p_general->i_children; + } + } + else + { + playlist_item_t *p_item = (playlist_item_t *)[item pointerValue]; + if( p_item ) + i_return = p_item->i_children; + } + vlc_object_release( p_playlist ); + + if( i_return <= 0 ) + return NO; + else + return YES; +} + +/* 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_t *p_playlist; + playlist_item_t *p_item; + + if( item == nil || ![item isKindOfClass: [NSValue class]] ) return( @"error" ); + + p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, + FIND_ANYWHERE ); + if( p_playlist == NULL ) + { + return( @"error" ); + } + + p_item = (playlist_item_t *)[item pointerValue]; + + if( p_item == NULL ) + { + vlc_object_release( p_playlist ); + return( @"error"); + } + + if( [[o_tc identifier] isEqualToString:@"1"] ) + { + o_value = [NSString stringWithUTF8String: + p_item->input.psz_name]; + if( o_value == NULL ) + o_value = [NSString stringWithCString: + p_item->input.psz_name]; + } + else if( [[o_tc identifier] isEqualToString:@"2"] ) + { + char *psz_temp; + psz_temp = vlc_input_item_GetInfo( &p_item->input ,_("Meta-information"),_("Artist") ); + + if( psz_temp == NULL ) + o_value = @""; + else + { + o_value = [NSString stringWithUTF8String: psz_temp]; + if( o_value == NULL ) + { + o_value = [NSString stringWithCString: psz_temp]; + } + free( psz_temp ); + } + } + else if( [[o_tc identifier] isEqualToString:@"3"] ) + { + char psz_duration[MSTRTIME_MAX_SIZE]; + mtime_t dur = p_item->input.i_duration; + if( dur != -1 ) + { + secstotimestr( psz_duration, dur/1000000 ); + o_value = [NSString stringWithUTF8String: psz_duration]; + } + else + { + o_value = @"-:--:--"; + } + } + vlc_object_release( p_playlist ); + + return( o_value ); +} + +@end + +/***************************************************************************** + * VLCPlaylistWizard implementation + *****************************************************************************/ +@implementation VLCPlaylistWizard + +- (IBAction)reloadOutlineView +{ + /* Only reload the outlineview if the wizard window is open since this can + be quite long on big playlists */ + if( [[o_outline_view window] isVisible] ) + { + [o_outline_view reloadData]; + } +} + +@end + /***************************************************************************** - * VLCPlaylist implementation + * VLCPlaylist implementation *****************************************************************************/ @implementation VLCPlaylist @@ -103,6 +356,10 @@ if ( self != nil ) { o_outline_dict = [[NSMutableDictionary alloc] init]; + o_nodes_array = [[NSMutableArray alloc] init]; + o_items_array = [[NSMutableArray alloc] init]; + + //i_moveRow = -1; } return self; @@ -116,12 +373,8 @@ FIND_ANYWHERE ); int i_index; - i_current_view = VIEW_CATEGORY; - playlist_ViewUpdate( p_playlist, i_current_view ); - [o_outline_view setTarget: self]; - [o_outline_view setDelegate: self]; - [o_outline_view setDataSource: self]; + [super awakeFromNib]; [o_outline_view setDoubleAction: @selector(playItem:)]; @@ -214,7 +467,6 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/ [o_search_field setHidden:YES]; } #endif - [self initStrings]; //[self playlistUpdated]; } @@ -225,17 +477,17 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/ - (void)initStrings { + [super initStrings]; + [o_mi_save_playlist setTitle: _NS("Save Playlist...")]; [o_mi_play setTitle: _NS("Play")]; [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("Properties")]; [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_tc_name headerCell] setStringValue:_NS("Name")]; - [[o_tc_author headerCell] setStringValue:_NS("Author")]; - [[o_tc_duration headerCell] setStringValue:_NS("Duration")]; [o_status_field setStringValue: [NSString stringWithFormat: _NS("no items in playlist")]]; @@ -249,12 +501,7 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/ [[o_loop_popup itemAtIndex:2] setTitle: _NS("Repeat All")]; } -- (NSOutlineView *)outlineView -{ - return o_outline_view; -} - -- (void)playlistUpdated +- (void)playlistUpdated { unsigned int i; @@ -270,6 +517,7 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/ // 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]; } - (void)playModeUpdated @@ -304,9 +552,23 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/ vlc_object_release( p_playlist ); } +- (playlist_item_t *)parentOfItem:(playlist_item_t *)p_item +{ + int i; + for( i = 0 ; i < p_item->i_parents; i++ ) + { + if( p_item->pp_parents[i]->i_view == i_current_view ) + { + return p_item->pp_parents[i]->p_parent; + } + } + return NULL; +} + - (void)updateRowSelection { - int i,i_row; +// int i; + int i_row; unsigned int j; playlist_t *p_playlist = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST, @@ -318,20 +580,26 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/ return; p_item = p_playlist->status.p_item; - if( p_item == NULL ) return; + if( p_item == NULL ) + { + vlc_object_release(p_playlist); + return; + } p_temp_item = p_item; while( p_temp_item->i_parents > 0 ) { [o_array insertObject: [NSValue valueWithPointer: p_temp_item] atIndex: 0]; - for (i = 0 ; i < p_temp_item->i_parents ; i++) + + p_temp_item = [self parentOfItem: p_temp_item]; + /*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++) @@ -353,7 +621,13 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/ vlc_object_release(p_playlist); } -- (BOOL)isItem: (playlist_item_t *)p_item inNode: (playlist_item_t *)p_node +/* 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 + 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 + { playlist_t * p_playlist = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE ); @@ -364,29 +638,51 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/ return NO; } + if( p_node == p_item ) + { + vlc_object_release(p_playlist); + return YES; + } + + if( p_node->i_children < 1) + { + vlc_object_release(p_playlist); + return NO; + } + if ( p_temp_item ) { int i; vlc_mutex_lock( &p_playlist->object_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++ ) - { - if( p_playlist->pp_all_items[i] == p_item ) break; - else if ( i == p_playlist->i_all_size - 1 ) + for( i = 0; i < p_playlist->i_all_size; i++ ) { - vlc_object_release( p_playlist ); - vlc_mutex_unlock( &p_playlist->object_lock ); - return NO; + if( p_playlist->pp_all_items[i] == p_item ) break; + else if ( i == p_playlist->i_all_size - 1 ) + { + vlc_object_release( p_playlist ); + vlc_mutex_unlock( &p_playlist->object_lock ); + return NO; + } } } while( p_temp_item->i_parents > 0 ) { - for( i = 0; i < p_temp_item->i_parents ; i++ ) + p_temp_item = [self parentOfItem: p_temp_item]; + if( p_temp_item == p_node ) + { + vlc_mutex_unlock( &p_playlist->object_lock ); + vlc_object_release( p_playlist ); + return YES; + } + +/* for( i = 0; i < p_temp_item->i_parents ; i++ ) { if( p_temp_item->pp_parents[i]->i_view == i_current_view ) { @@ -402,36 +698,41 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/ break; } } - } - vlc_mutex_unlock( &p_playlist->object_lock ); + }*/ } + vlc_mutex_unlock( &p_playlist->object_lock ); } vlc_object_release( p_playlist ); return NO; } -- (BOOL)isValueItem: (id)o_item inNode: (id)o_node +/* 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 { - int i; - int i_total = [[o_outline_view dataSource] outlineView:o_outline_view - numberOfChildrenOfItem: o_node]; - for( i = 0 ; i < i_total ; i++ ) + unsigned int i, j; + for( i = 0 ; i < [o_items count] ; i++ ) { - id o_temp_item = [[o_outline_view dataSource] outlineView: - o_outline_view child:i ofItem: o_node]; - if( [[o_outline_view dataSource] outlineView:o_outline_view - numberOfChildrenOfItem: o_temp_item] > 0 ) + for ( j = 0 ; j < [o_nodes count] ; j++ ) { - if( [self isValueItem: o_item inNode: o_temp_item] == YES ) - return YES; - } - else if( [o_temp_item isEqual: o_item] ) - { - return YES; + if( o_items == o_nodes) + { + if( j == i ) continue; + } + if( [self isItem: [[o_items objectAtIndex:i] pointerValue] + inNode: [[o_nodes objectAtIndex:j] pointerValue] + checkItemExistence: NO] ) + { + [o_items removeObjectAtIndex:i]; + /* We need to execute the next iteration with the same index + since the current item has been deleted */ + i--; + break; + } } } - return NO; + } - (IBAction)savePlaylist:(id)sender @@ -464,7 +765,7 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/ { playlist_item_t *p_item; playlist_item_t *p_node = NULL; - int i; +// int i; p_item = [[o_outline_view itemAtRow:[o_outline_view selectedRow]] pointerValue]; @@ -472,13 +773,15 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/ { if( p_item->i_children == -1 ) { - for( i = 0 ; i < p_item->i_parents ; i++ ) + p_node = [self parentOfItem: p_item]; + +/* for( i = 0 ; i < p_item->i_parents ; i++ ) { if( p_item->pp_parents[i]->i_view == i_current_view ) { p_node = p_item->pp_parents[i]->p_parent; } - } + }*/ } else { @@ -556,10 +859,10 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/ numberOfChildrenOfItem: o_item] > 0 ) //is a node and not an item { - id o_playing_item = [o_outline_dict objectForKey: - [NSString stringWithFormat: @"%p", p_playlist->status.p_item]]; if( p_playlist->status.i_status != PLAYLIST_STOPPED && - [self isValueItem: o_playing_item inNode: o_item] == YES ) + [self isItem: p_playlist->status.p_item inNode: + ((playlist_item_t *)[o_item pointerValue]) + checkItemExistence: NO] == YES ) { // if current item is in selected node and is playing then stop playlist playlist_Stop( p_playlist ); @@ -977,6 +1280,32 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/ vlc_object_release( p_playlist ); } +- (IBAction)recursiveExpandNode:(id)sender +{ + int i; + id o_item = [o_outline_view itemAtRow: [o_outline_view selectedRow]]; + playlist_item_t *p_item = (playlist_item_t *)[o_item pointerValue]; + + if( ![[o_outline_view dataSource] outlineView: o_outline_view + isItemExpandable: o_item] ) + { + for( i = 0 ; i < p_item->i_parents ; i++ ) + { + if( p_item->pp_parents[i]->i_view == i_current_view ) + { + o_item = [o_outline_dict objectForKey: [NSString + stringWithFormat: @"%p", p_item->pp_parents[i]->p_parent]]; + break; + } + } + } + + /* We need to collapse the node first, since OSX refuses to recursively + expand an already expanded node, even if children nodes are collapsed. */ + [o_outline_view collapseItem: o_item collapseChildren: YES]; + [o_outline_view expandItem: o_item expandChildren: YES]; +} + - (NSMenu *)menuForEvent:(NSEvent *)o_event { NSPoint pt; @@ -993,16 +1322,13 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/ [o_mi_delete setEnabled: b_item_sel]; [o_mi_selectall setEnabled: b_rows]; [o_mi_info setEnabled: b_item_sel]; + [o_mi_recursive_expand setEnabled: b_item_sel]; + [o_mi_sort_name setEnabled: b_item_sel]; + [o_mi_sort_author setEnabled: b_item_sel]; return( o_ctx_menu ); } -- (playlist_item_t *)selectedPlaylistItem -{ - return [[o_outline_view itemAtRow: [o_outline_view selectedRow]] - pointerValue]; -} - - (void)outlineView: (NSTableView*)o_tv didClickTableColumn:(NSTableColumn *)o_tc { @@ -1092,8 +1418,9 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/ o_playing_item = [o_outline_dict objectForKey: [NSString stringWithFormat:@"%p", p_playlist->status.p_item]]; - if( [self isValueItem: o_playing_item inNode: item] || - [o_playing_item isEqual: item] ) + if( [self isItem: [o_playing_item pointerValue] inNode: + [item pointerValue] checkItemExistence: YES] + || [o_playing_item isEqual: item] ) { [cell setFont: [NSFont boldSystemFontOfSize: 0]]; } @@ -1108,82 +1435,14 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/ @implementation VLCPlaylist (NSOutlineViewDataSource) -/* return the number of children for Obj-C pointer item */ /* DONE */ -- (int)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item -{ - int i_return = 0; - playlist_t * p_playlist = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - if( p_playlist == NULL || outlineView != o_outline_view ) - return 0; - - if( item == nil ) - { - /* root object */ - playlist_view_t *p_view; - p_view = playlist_ViewFind( p_playlist, i_current_view ); - if( p_view && p_view->p_root ) - { - i_return = p_view->p_root->i_children; - if( i_current_view == VIEW_CATEGORY ) - { - i_return--; /* remove the GENERAL item from the list */ - i_return += p_playlist->p_general->i_children; /* add the items of the general node */ - } - } - } - else - { - playlist_item_t *p_item = (playlist_item_t *)[item pointerValue]; - if( p_item ) - i_return = p_item->i_children; - } - vlc_object_release( p_playlist ); - - if( i_return <= 0 ) - i_return = 0; - - return i_return; -} - -/* return the child at index for the Obj-C pointer item */ /* DONE */ - (id)outlineView:(NSOutlineView *)outlineView child:(int)index ofItem:(id)item { - playlist_item_t *p_return = NULL; - playlist_t * p_playlist = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - NSValue *o_value; + id o_value = [super outlineView: outlineView child: index ofItem: item]; + playlist_t *p_playlist = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST, + FIND_ANYWHERE ); - if( p_playlist == NULL ) - return nil; + if( !p_playlist ) return nil; - if( item == nil ) - { - /* root object */ - playlist_view_t *p_view; - p_view = playlist_ViewFind( p_playlist, i_current_view ); - if( p_view && p_view->p_root ) p_return = p_view->p_root->pp_children[index]; - - if( i_current_view == VIEW_CATEGORY ) - { - if( p_playlist->p_general->i_children && index >= 0 && index < p_playlist->p_general->i_children ) - { - p_return = p_playlist->p_general->pp_children[index]; - } - else if( p_view && p_view->p_root && index >= 0 && index - p_playlist->p_general->i_children < p_view->p_root->i_children ) - { - p_return = p_view->p_root->pp_children[index - p_playlist->p_general->i_children + 1]; - - } - } - } - else - { - playlist_item_t *p_item = (playlist_item_t *)[item pointerValue]; - if( p_item && index < p_item->i_children && index >= 0 ) - p_return = p_item->pp_children[index]; - } - if( p_playlist->i_size >= 2 ) { [o_status_field setStringValue: [NSString stringWithFormat: @@ -1202,166 +1461,143 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/ _NS("1 item in playlist"), p_playlist->i_size]]; } } - vlc_object_release( p_playlist ); - o_value = [[NSValue valueWithPointer: p_return] retain]; + [o_outline_dict setObject:o_value forKey:[NSString stringWithFormat:@"%p", + [o_value pointerValue]]]; - [o_outline_dict setObject:o_value forKey:[NSString stringWithFormat:@"%p", p_return]]; return o_value; -} - -/* is the item expandable */ -- (BOOL)outlineView:(NSOutlineView *)outlineView isItemExpandable:(id)item -{ - int i_return = 0; - playlist_t * p_playlist = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - if( p_playlist == NULL ) - return NO; - - if( item == nil ) - { - /* root object */ - playlist_view_t *p_view; - p_view = playlist_ViewFind( p_playlist, i_current_view ); - if( p_view && p_view->p_root ) i_return = p_view->p_root->i_children; - - if( i_current_view == VIEW_CATEGORY ) - { - i_return--; - i_return += p_playlist->p_general->i_children; - } - } - else - { - playlist_item_t *p_item = (playlist_item_t *)[item pointerValue]; - if( p_item ) - i_return = p_item->i_children; - } - vlc_object_release( p_playlist ); - if( i_return <= 0 ) - return NO; - else - return YES; } -/* retrieve the string values for the cells */ -- (id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTableColumn *)o_tc byItem:(id)item +/* Required for drag & drop and reordering */ +- (BOOL)outlineView:(NSOutlineView *)outlineView writeItems:(NSArray *)items toPasteboard:(NSPasteboard *)pboard { - id o_value = nil; - intf_thread_t *p_intf = VLCIntf; - playlist_t *p_playlist; - playlist_item_t *p_item; - - if( item == nil || ![item isKindOfClass: [NSValue class]] ) return( @"error" ); - - p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, + unsigned int i,j; + playlist_t *p_playlist = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE ); - if( p_playlist == NULL ) - { - return( @"error" ); - } - p_item = (playlist_item_t *)[item pointerValue]; + /* First remove the items that were moved during the last drag & drop + operation */ + [o_items_array removeAllObjects]; + [o_nodes_array removeAllObjects]; - if( p_item == NULL ) - { - vlc_object_release( p_playlist ); - return( @"error"); - } + if( !p_playlist ) return NO; - if( [[o_tc identifier] isEqualToString:@"1"] ) - { - o_value = [NSString stringWithUTF8String: - p_item->input.psz_name]; - if( o_value == NULL ) - o_value = [NSString stringWithCString: - p_item->input.psz_name]; - } - else if( [[o_tc identifier] isEqualToString:@"2"] ) + for( i = 0 ; i < [items count] ; i++ ) { - char *psz_temp; - psz_temp = vlc_input_item_GetInfo( &p_item->input ,_("Meta-information"),_("Artist") ); + id o_item = [items objectAtIndex: i]; - if( psz_temp == NULL ) - o_value = @""; + /* Refuse to move items that are not in the General Node + (Service Discovery) */ + if( ![self isItem: [o_item pointerValue] inNode: + p_playlist->p_general checkItemExistence: NO]) + { + vlc_object_release(p_playlist); + return NO; + } + /* Fill the items and nodes to move in 2 different arrays */ + if( ((playlist_item_t *)[o_item pointerValue])->i_children > 0 ) + [o_nodes_array addObject: o_item]; else + [o_items_array addObject: o_item]; + } + + /* Now we need to check if there are selected items that are in already + selected nodes. In that case, we only want to move the nodes */ + [self removeItemsFrom: o_nodes_array ifChildrenOf: o_nodes_array]; + [self removeItemsFrom: o_items_array ifChildrenOf: o_nodes_array]; + +#if 0 + for( i = 0 ; i < [o_nodes_array count] ; i++ ) + { + for ( j = 0 ; j < [o_nodes_array count] ; j++ ) { - o_value = [NSString stringWithUTF8String: psz_temp]; - if( o_value == NULL ) + if( j == i ) continue; + if( [self isItem: [[o_nodes_array objectAtIndex:i] pointerValue] + inNode: [[o_nodes_array objectAtIndex:j] pointerValue]] ) { - o_value = [NSString stringWithCString: psz_temp]; + [o_nodes_array removeObjectAtIndex:i]; + /* We need to execute the next iteration with the same index + since the current item has been deleted */ + i--; + break; } - free( psz_temp ); } } - else if( [[o_tc identifier] isEqualToString:@"3"] ) + + for( i = 0 ; i < [o_items_array count] ; i++ ) { - char psz_duration[MSTRTIME_MAX_SIZE]; - mtime_t dur = p_item->input.i_duration; - if( dur != -1 ) - { - secstotimestr( psz_duration, dur/1000000 ); - o_value = [NSString stringWithUTF8String: psz_duration]; - } - else + for ( j = 0 ; j < [o_nodes_array count] ; j++ ) { - o_value = @"-:--:--"; + if( [self isItem: [[o_items_array objectAtIndex:i] pointerValue] + inNode: [[o_nodes_array objectAtIndex:j] pointerValue]] ) + { + [o_items_array removeObjectAtIndex:i]; + i--; + break; + } } } - vlc_object_release( p_playlist ); +#endif + /* We add the "VLCPlaylistItemPboardType" type to be able to recognize + a Drop operation comçing from the playlist. + We need to add NSFilenamesPboardType otherwise the outlineview refuses + to the drop. */ - return( o_value ); + [pboard declareTypes: [NSArray arrayWithObjects: + @"VLCPlaylistItemPboardType",NSFilenamesPboardType, nil] owner: self]; + [pboard setPropertyList:[NSArray array] + forType:NSFilenamesPboardType]; + + vlc_object_release(p_playlist); + return YES; } -/* Required for drag & drop and reordering */ -- (BOOL)outlineView:(NSOutlineView *)outlineView writeItems:(NSArray *)items toPasteboard:(NSPasteboard *)pboard +- (NSDragOperation)outlineView:(NSOutlineView *)outlineView validateDrop:(id )info proposedItem:(id)item proposedChildIndex:(int)index { - unsigned int i; playlist_t *p_playlist = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE ); - NSArray *o_array; - - if( !p_playlist ) return NO; + NSPasteboard *o_pasteboard = [info draggingPasteboard]; - [pboard declareTypes: [NSArray arrayWithObject: - @"VLCPlaylistItemPboardType"] owner: nil]; + if( !p_playlist ) return NSDragOperationNone; - for( i = 0 ; i < [items count] ; i++ ) + /* 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_general + checkItemExistence: NO] || item == nil) ) { - id o_item = [items objectAtIndex: i]; - - if( ![self isItem: [o_item pointerValue] inNode: - p_playlist->p_general] ) - { - vlc_object_release(p_playlist); - return NO; - } + vlc_object_release(p_playlist); + return NSDragOperationNone; } - o_array = [NSArray arrayWithArray: items]; - - if( ![pboard setPropertyList:(id)o_array - forType:@"VLCPlaylistItemPboardType"] ) + /* Drop from the Playlist */ + if( [[o_pasteboard types] containsObject: @"VLCPlaylistItemPboardType"] ) { + unsigned int i; + for( i = 0 ; i < [o_nodes_array count] ; i++ ) + { + /* We refuse to Drop in a child of an item we are moving */ + if( [self isItem: [item pointerValue] inNode: + [[o_nodes_array objectAtIndex: i] pointerValue] + checkItemExistence: NO] ) + { + vlc_object_release(p_playlist); + return NSDragOperationNone; + } + } vlc_object_release(p_playlist); - return NO; + return NSDragOperationMove; } - vlc_object_release(p_playlist); - return YES; -} - -- (NSDragOperation)outlineView:(NSOutlineView *)outlineView validateDrop:(id )info proposedItem:(id)item proposedChildIndex:(int)index -{ - NSPasteboard *o_pasteboard = [info draggingPasteboard]; - - if( [[o_pasteboard types] containsObject: NSFilenamesPboardType] ) + /* Drop from the Finder */ + else if( [[o_pasteboard types] containsObject: NSFilenamesPboardType] ) { + vlc_object_release(p_playlist); return NSDragOperationGeneric; } + vlc_object_release(p_playlist); return NSDragOperationNone; } @@ -1373,7 +1609,128 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/ if( !p_playlist ) return NO; - if( [[o_pasteboard types] containsObject: NSFilenamesPboardType] ) + /* Drag & Drop inside the playlist */ + if( [[o_pasteboard types] containsObject: @"VLCPlaylistItemPboardType"] ) + { + int i_row; + unsigned int i; + playlist_item_t *p_new_parent, *p_item = NULL; + NSArray *o_all_items = [o_nodes_array arrayByAddingObjectsFromArray: + o_items_array]; + /* If the item is to be dropped as root item of the outline, make it a + child of the General node. + Else, choose the proposed parent as parent. */ + if( item == nil ) + p_new_parent = p_playlist->p_general; + else + p_new_parent = [item pointerValue]; + + /* If the proposed parent is not a node, then use the parent node of + this item. */ + if( p_new_parent->i_children <= 0 ) + { + int j; + playlist_item_t *p_temp_item = p_new_parent; + p_new_parent = [self parentOfItem: p_new_parent]; + if( !p_new_parent ) + { + vlc_object_release(p_playlist); + return NO; + } + /* Calculate the position of the dropped item in this new parent: + following the first proposed parent. */ + for( j = 0; j < p_new_parent->i_children; j++ ) + { + if( p_new_parent->pp_children[j] == p_temp_item ) + { + index = j; + break; + } + else if( j == p_new_parent->i_children - 1 ) + index = -1; + } + } + + for( i = 0; i < [o_all_items count]; i++ ) + { + playlist_item_t *p_old_parent = NULL; + int i_old_index = 0; + + p_item = [[o_all_items objectAtIndex:i] pointerValue]; + p_old_parent = [self parentOfItem: p_item]; + if( !p_old_parent ) + continue; + /* We may need the old index later */ + if( p_new_parent == p_old_parent ) + { + int j; + for( j = 0; j < p_old_parent->i_children; j++ ) + { + if( p_old_parent->pp_children[j] == p_item ) + { + i_old_index = j; + break; + } + } + } + + + /* If we move the playing item in a different node or we move the + node containing the playing item in a different node, then stop + playback, or the playlist refuses to detach the item. */ +/* if( p_playlist->status.i_status != PLAYLIST_STOPPED && + (( p_item == p_playlist->status.p_item && + p_new_parent != p_old_parent) || + ( p_item->i_children > 0 && + [self isItem: p_playlist->status.p_item inNode:p_item] == YES)) + { + playlist_Stop( p_playlist ); + }*/ + vlc_mutex_lock( &p_playlist->object_lock ); + // Acually detach the item from the old position + if( playlist_NodeRemoveItem( p_playlist, p_item, p_old_parent ) == + VLC_SUCCESS && + playlist_NodeRemoveParent( p_playlist, p_item, p_old_parent ) == + VLC_SUCCESS ) + { + int i_new_index; + /* Calculate the new index */ + if( index == -1 ) + i_new_index = -1; + /* If we move the item in the same node, we need to take into + account that one item will be deleted */ + else if((p_new_parent == p_old_parent && + i_old_index < index + (int)i) + || p_new_parent == p_playlist->p_general || index == 0 ) + i_new_index = index + i; + else + i_new_index = index + i + 1; + // Reattach the item to the new position + playlist_NodeInsert( p_playlist, i_current_view, p_item, + p_new_parent, i_new_index ); + } + vlc_mutex_unlock( &p_playlist->object_lock ); + } + [self playlistUpdated]; + i_row = [o_outline_view rowForItem:[o_outline_dict + objectForKey:[NSString stringWithFormat: @"%p", + [[o_all_items objectAtIndex: 0] pointerValue]]]]; + + if( i_row == -1 ) + { + i_row = [o_outline_view rowForItem:[o_outline_dict + objectForKey:[NSString stringWithFormat: @"%p", p_new_parent]]]; + } + + [o_outline_view deselectAll: self]; + [o_outline_view selectRow: i_row byExtendingSelection: NO]; + [o_outline_view scrollRowToVisible: i_row]; + + vlc_object_release(p_playlist); + return YES; + } + + else if( [[o_pasteboard types] containsObject: NSFilenamesPboardType] ) { int i; playlist_item_t *p_node = [item pointerValue]; @@ -1410,6 +1767,7 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/ } if( i_counter == p_node->i_parents ) { + vlc_object_release(p_playlist); return NO; } }