X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fplaylist.m;h=e0e6c22c2df22e7a9aae6808abe0728b177cd964;hb=f452c11004a9eddf5fa3c9342b44590c936018a1;hp=8674a4300346fc923503a81dd4ebf98c649a0c2a;hpb=458c3d8f49d71c68117160598e92697c3ab286a2;p=vlc diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m index 8674a43003..e0e6c22c2d 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-2006 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 @@ -20,14 +20,12 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /* TODO * add 'icons' for different types of nodes? (http://www.cocoadev.com/index.pl?IconAndTextInTableCell) - * create a new search field build with pictures from the 'regular' search field, so it can be emulated on 10.2 * create toggle buttons for the shuffle, repeat one, repeat all functions. - * implement drag and drop and item reordering. * 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 @@ -44,14 +42,18 @@ #include #include -#include "intf.h" -#include "playlist.h" -#include "controls.h" -#include "osd.h" -#include "misc.h" +#import "intf.h" +#import "wizard.h" +#import "bookmarks.h" +#import "playlistinfo.h" +#import "playlist.h" +#import "controls.h" +#import "vlc_osd.h" +#import "misc.h" +#import /***************************************************************************** - * VLCPlaylistView implementation + * VLCPlaylistView implementation *****************************************************************************/ @implementation VLCPlaylistView @@ -92,10 +94,14 @@ @end + /***************************************************************************** - * VLCPlaylist implementation + * VLCPlaylistCommon implementation + * + * This class the superclass of the VLCPlaylist and VLCPlaylistWizard. + * It contains the common methods and elements of these 2 entities. *****************************************************************************/ -@implementation VLCPlaylist +@implementation VLCPlaylistCommon - (id)init { @@ -103,118 +109,335 @@ if ( self != nil ) { o_outline_dict = [[NSMutableDictionary alloc] init]; - //i_moveRow = -1; } return self; } - - (void)awakeFromNib { - playlist_t * p_playlist = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - vlc_list_t *p_list = vlc_list_find( p_playlist, VLC_OBJECT_MODULE, - FIND_ANYWHERE ); - - int i_index; - i_current_view = VIEW_CATEGORY; - playlist_ViewUpdate( p_playlist, i_current_view ); - + playlist_t * p_playlist = pl_Yield( VLCIntf ); [o_outline_view setTarget: self]; [o_outline_view setDelegate: self]; [o_outline_view setDataSource: self]; - [o_outline_view setDoubleAction: @selector(playItem:)]; + vlc_object_release( p_playlist ); + [self initStrings]; +} - [o_outline_view registerForDraggedTypes: - [NSArray arrayWithObjects: NSFilenamesPboardType, nil]]; - [o_outline_view setIntercellSpacing: NSMakeSize (0.0, 1.0)]; +- (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_item_t *p_item = NULL; + playlist_t * p_playlist = pl_Yield( VLCIntf ); + if( outlineView != o_outline_view ) + { + vlc_object_release( p_playlist ); + return 0; + } + + if( item == nil ) + { + /* root object */ + 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 ); + + 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, *p_item = NULL; + NSValue *o_value; + playlist_t * p_playlist = pl_Yield( VLCIntf ); + + if( item == nil ) + { + /* root object */ + p_item = p_playlist->p_root_category; + } + else + { + 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( o_value == nil ) + { + o_value = [[NSValue valueWithPointer: p_return] retain]; + msg_Err( VLCIntf, "missing playlist item's pointer value" ); + } + return o_value; +} -/* We need to check whether _defaultTableHeaderSortImage exists, since it -belongs to an Apple hidden private API, and then can "disapear" at any time*/ +/* is the item expandable */ +- (BOOL)outlineView:(NSOutlineView *)outlineView isItemExpandable:(id)item +{ + int i_return = 0; + playlist_t *p_playlist = pl_Yield( VLCIntf ); - if( [[NSOutlineView class] respondsToSelector:@selector(_defaultTableHeaderSortImage)] ) + if( item == nil ) { - o_ascendingSortingImage = [[NSOutlineView class] _defaultTableHeaderSortImage]; + /* root object */ + if( p_playlist->p_root_category ) + { + i_return = p_playlist->p_root_category->i_children; + } } else { - o_ascendingSortingImage = nil; + playlist_item_t *p_item = (playlist_item_t *)[item pointerValue]; + if( p_item ) + i_return = p_item->i_children; } + vlc_object_release( p_playlist ); + + 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; + playlist_item_t *p_item; + + /* For error handling */ + static BOOL attempted_reload = NO; - if( [[NSOutlineView class] respondsToSelector:@selector(_defaultTableHeaderReverseSortImage)] ) + 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 || !p_item->p_input ) { - o_descendingSortingImage = [[NSOutlineView class] _defaultTableHeaderReverseSortImage]; + /* 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"; + } + + attempted_reload = NO; + + if( [[o_tc identifier] isEqualToString:@"1"] ) + { + /* 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]; + if( o_value == NULL ) + o_value = [NSString stringWithCString: psz_title]; + } + else + { + char *psz_name = input_item_GetName( p_item->p_input ); + if( psz_name != NULL ) + { + o_value = [NSString stringWithUTF8String: psz_name]; + if( o_value == NULL ) + o_value = [NSString stringWithCString: psz_name]; + } + free( psz_name ); + } + free( psz_title ); } else { - o_descendingSortingImage = nil; + char *psz_artist = input_item_GetArtist( p_item->p_input ); + if( [[o_tc identifier] isEqualToString:@"2"] && !EMPTY_STR( psz_artist ) ) + { + o_value = [NSString stringWithUTF8String: psz_artist]; + if( o_value == NULL ) + o_value = [NSString stringWithCString: psz_artist]; + } + else if( [[o_tc identifier] isEqualToString:@"3"] ) + { + 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 = @"-:--:--"; + } + } + free( psz_artist ); } + 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 + +/***************************************************************************** + * extension to NSOutlineView's interface to fix compilation warnings + * and let us access these 2 functions properly + * this uses a private Apple-API, but works fine on all current OSX releases + * keep checking for compatiblity with future releases though + *****************************************************************************/ + +@interface NSOutlineView (UndocumentedSortImages) ++ (NSImage *)_defaultTableHeaderSortImage; ++ (NSImage *)_defaultTableHeaderReverseSortImage; +@end + + +/***************************************************************************** + * VLCPlaylist implementation + *****************************************************************************/ +@implementation VLCPlaylist + +- (id)init +{ + self = [super init]; + if ( self != nil ) + { + o_nodes_array = [[NSMutableArray alloc] init]; + o_items_array = [[NSMutableArray alloc] init]; + } + return self; +} + +- (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; + + [super awakeFromNib]; + + [o_outline_view setDoubleAction: @selector(playItem:)]; + + [o_outline_view registerForDraggedTypes: + [NSArray arrayWithObjects: NSFilenamesPboardType, + @"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! + * 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++ ) { - NSMenuItem * o_lmi; - module_t * p_parser = (module_t *)p_list->p_values[i_index].p_object ; + vlc_bool_t b_enabled; + char *objectname; + 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 */ + /* Check for submodules */ + int i = -1; + while( p_parser->pp_shortcuts[++i] != NULL ); i--; + + /* Check whether to enable these menuitems */ + objectname = i>=0 ? (char *)p_parser->pp_shortcuts[i] : (char *)p_parser->psz_object_name; + b_enabled = playlist_IsServicesDiscoveryLoaded( p_playlist, objectname ); + + /* 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)] + objectname)] 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 setRepresentedObject: [NSString stringWithCString: objectname]]; + 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: p_parser->psz_longname ? p_parser->psz_longname : ( p_parser->psz_shortname ? p_parser->psz_shortname: - p_parser->psz_object_name)] + objectname)] 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]; + [o_lmi setRepresentedObject: [NSString stringWithCString:objectname]]; + if( b_enabled ) [o_lmi setState: NSOnState]; } } vlc_list_release( p_list ); vlc_object_release( p_playlist ); - /* Change the simple textfield into a searchField if we can... */ -#if 0 - if( MACOS_VERSION >= 10.3 ) - { - NSView *o_parentview = [o_status_field superview]; - NSSearchField *o_better_search_field = [[NSSearchField alloc]initWithFrame:[o_search_field frame]]; - [o_better_search_field setRecentsAutosaveName:@"VLC media player search"]; - [o_better_search_field setDelegate:self]; - [[NSNotificationCenter defaultCenter] addObserver: self - selector: @selector(searchfieldChanged:) - name: NSControlTextDidChangeNotification - object: o_better_search_field]; - - [o_better_search_field setTarget:self]; - [o_better_search_field setAction:@selector(searchItem:)]; - - [o_better_search_field setAutoresizingMask:NSViewMinXMargin]; - [o_parentview addSubview:o_better_search_field]; - [o_search_field setHidden:YES]; - } -#endif - [self initStrings]; //[self playlistUpdated]; } @@ -225,40 +448,37 @@ 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_info setTitle: _NS("Information")]; + [o_mi_preparse setTitle: _NS("Get Stream Information")]; [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")]]; + _NS("No items in the playlist")]]; - [o_random_ckb setTitle: _NS("Random")]; #if 0 [o_search_button setTitle: _NS("Search")]; #endif [o_search_field setToolTip: _NS("Search in Playlist")]; - [[o_loop_popup itemAtIndex:0] setTitle: _NS("Standard Play")]; - [[o_loop_popup itemAtIndex:1] setTitle: _NS("Repeat One")]; - [[o_loop_popup itemAtIndex:2] setTitle: _NS("Repeat All")]; -} + [o_mi_addNode setTitle: _NS("Add Folder to Playlist")]; -- (NSOutlineView *)outlineView -{ - return o_outline_view; + [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)")]; } - (void)playlistUpdated { unsigned int i; - /* Clear indications of any existing column sorting*/ + /* Clear indications of any existing column sorting */ for( i = 0 ; i < [[o_outline_view tableColumns] count] ; i++ ) { [o_outline_view setIndicatorImage:nil inTableColumn: @@ -270,77 +490,92 @@ 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]; + [[[[VLCMain sharedInstance] getBookmarks] getDataTable] reloadData]; + + playlist_t *p_playlist = pl_Yield( VLCIntf ); + + if( playlist_CurrentSize( p_playlist ) >= 2 ) + { + [o_status_field setStringValue: [NSString stringWithFormat: + _NS("%i items in the playlist"), + playlist_CurrentSize( p_playlist )]]; + } + else + { + if( playlist_IsEmpty( p_playlist ) ) + [o_status_field setStringValue: _NS("No items in the playlist")]; + else + [o_status_field setStringValue: _NS("1 item in the playlist")]; + } + vlc_object_release( p_playlist ); } - (void)playModeUpdated { - playlist_t *p_playlist = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); + playlist_t *p_playlist = pl_Yield( VLCIntf ); vlc_value_t val, val2; - if( p_playlist == NULL ) - { - return; - } - var_Get( p_playlist, "loop", &val2 ); var_Get( p_playlist, "repeat", &val ); if( val.b_bool == VLC_TRUE ) { - [o_loop_popup selectItemAtIndex: 1]; + [[[VLCMain sharedInstance] getControls] repeatOne]; } else if( val2.b_bool == VLC_TRUE ) { - [o_loop_popup selectItemAtIndex: 2]; + [[[VLCMain sharedInstance] getControls] repeatAll]; } else { - [o_loop_popup selectItemAtIndex: 0]; + [[[VLCMain sharedInstance] getControls] repeatOff]; } - var_Get( p_playlist, "random", &val ); - [o_random_ckb setState: val.b_bool]; + [[[VLCMain sharedInstance] getControls] shuffle]; vlc_object_release( p_playlist ); } - (void)updateRowSelection { - int i,i_row; + int i_row; unsigned int j; - playlist_t *p_playlist = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); + playlist_t *p_playlist = pl_Yield( VLCIntf ); playlist_item_t *p_item, *p_temp_item; NSMutableArray *o_array = [NSMutableArray array]; - if( p_playlist == NULL ) - 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 ) + while( p_temp_item->p_parent ) { [o_array insertObject: [NSValue valueWithPointer: p_temp_item] atIndex: 0]; - for (i = 0 ; i < p_temp_item->i_parents ; i++) + 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++) + for( j = 0; j < [o_array count] - 1; j++ ) { id o_item; if( ( o_item = [o_outline_dict objectForKey: [NSString stringWithFormat: @"%p", [[o_array objectAtIndex:j] pointerValue]]] ) != nil ) + { [o_outline_view expandItem: o_item]; + } } @@ -350,45 +585,68 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/ [o_outline_view selectRow: i_row byExtendingSelection: NO]; [o_outline_view scrollRowToVisible: i_row]; - vlc_object_release(p_playlist); + 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 + 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 -- (BOOL)isItem: (playlist_item_t *)p_item inNode: (playlist_item_t *)p_node { - playlist_t * p_playlist = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); + playlist_t * p_playlist = pl_Yield( VLCIntf ); playlist_item_t *p_temp_item = p_item; - if( p_playlist == NULL ) + 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 ); - while( p_temp_item->i_parents > 0 ) + + if( b_check ) { - int i; - for( i = 0; i < p_temp_item->i_parents ; i++ ) + /* 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->all_items.i_size; i++ ) { - if( p_temp_item->pp_parents[i]->i_view == i_current_view ) + if( ARRAY_VAL( p_playlist->all_items, i) == p_item ) break; + else if ( i == p_playlist->all_items.i_size - 1 ) { - if( p_temp_item->pp_parents[i]->p_parent == p_node ) - { - vlc_object_release( p_playlist ); - vlc_mutex_unlock( &p_playlist->object_lock ); - return YES; - } - else - { - p_temp_item = p_temp_item->pp_parents[i]->p_parent; - break; - } + vlc_object_release( p_playlist ); + vlc_mutex_unlock( &p_playlist->object_lock ); + return NO; } } } + + while( p_temp_item ) + { + 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; + } + } vlc_mutex_unlock( &p_playlist->object_lock ); } @@ -396,86 +654,183 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/ return 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 +{ + unsigned int i, j; + for( i = 0 ; i < [o_items count] ; i++ ) + { + for ( j = 0 ; j < [o_nodes count] ; j++ ) + { + 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; + } + } + } + +} + - (IBAction)savePlaylist:(id)sender { intf_thread_t * p_intf = VLCIntf; - playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); + playlist_t * p_playlist = pl_Yield( p_intf ); NSSavePanel *o_save_panel = [NSSavePanel savePanel]; - NSString * o_name = [NSString stringWithFormat: @"%@.m3u", _NS("Untitled")]; + 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]; if( [o_save_panel runModalForDirectory: nil file: o_name] == NSOKButton ) { - playlist_Export( p_playlist, [[o_save_panel filename] fileSystemRepresentation], "export-m3u" ); + NSString *o_filename = [o_save_panel filename]; + + if( [o_save_accessory_popup indexOfSelectedItem] == 1 ) + { + NSString * o_real_filename; + NSRange range; + range.location = [o_filename length] - [@".xspf" length]; + range.length = [@".xspf" length]; + + if( [o_filename compare:@".xspf" options: NSCaseInsensitiveSearch + range: range] != NSOrderedSame ) + { + o_real_filename = [NSString stringWithFormat: @"%@.xspf", o_filename]; + } + else + { + o_real_filename = o_filename; + } + playlist_Export( p_playlist, + [o_real_filename fileSystemRepresentation], + p_playlist->p_local_category, "export-xspf" ); + } + else + { + 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" ); + } } + vlc_object_release( p_playlist ); } - /* 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 = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); + playlist_t * p_playlist = pl_Yield( p_intf ); + + playlist_item_t *p_item; + playlist_item_t *p_node = NULL; - if( p_playlist != NULL ) + p_item = [[o_outline_view itemAtRow:[o_outline_view selectedRow]] pointerValue]; + + if( p_item ) { - playlist_item_t *p_item; - playlist_item_t *p_node = NULL; - int i; + 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, VLC_TRUE, p_node, p_item ); + } + vlc_object_release( p_playlist ); +} + +/* 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 ); + + o_to_preparse = [NSMutableArray arrayWithArray:[[o_outline_view selectedRowEnumerator] allObjects]]; + i_count = [o_to_preparse count]; - p_item = [[o_outline_view itemAtRow:[o_outline_view selectedRow]] pointerValue]; + 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 ) { if( p_item->i_children == -1 ) { - 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; - } - } + playlist_PreparseEnqueue( p_playlist, p_item->p_input ); } 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; - } + msg_Dbg( p_intf, "preparse of nodes not yet implemented" ); } - playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, i_current_view, p_node, p_item ); } - vlc_object_release( p_playlist ); } + vlc_object_release( p_playlist ); + [self playlistUpdated]; } - (IBAction)servicesChange:(id)sender { NSMenuItem *o_mi = (NSMenuItem *)sender; NSString *o_string = [o_mi representedObject]; - playlist_t * p_playlist = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - if( !playlist_IsServicesDiscoveryLoaded( p_playlist, [o_string cString] ) ) - playlist_ServicesDiscoveryAdd( p_playlist, [o_string cString] ); + playlist_t * p_playlist = pl_Yield( VLCIntf ); + 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]; - i_current_view = VIEW_CATEGORY; - playlist_ViewUpdate( p_playlist, i_current_view ); vlc_object_release( p_playlist ); [self playlistUpdated]; return; @@ -494,46 +849,40 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/ playlist_t * p_playlist; intf_thread_t * p_intf = VLCIntf; - - p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - - if ( p_playlist == NULL ) - { - return; - } + + 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++ ) { - playlist_item_t * p_item; 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]; [o_to_delete removeObject: o_number]; [o_outline_view deselectRow: i_row]; - p_item = (playlist_item_t *)[[o_outline_view itemAtRow: i_row] pointerValue]; - - if( p_item->i_children > -1 ) //is a node and not an item + if( [[o_outline_view dataSource] outlineView:o_outline_view + numberOfChildrenOfItem: o_item] > 0 ) + //is a node and not an item { if( p_playlist->status.i_status != PLAYLIST_STOPPED && - [self isItem: p_playlist->status.p_item inNode: p_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 ); } + vlc_mutex_lock( &p_playlist->object_lock ); playlist_NodeDelete( p_playlist, p_item, VLC_TRUE, VLC_FALSE ); + vlc_mutex_unlock( &p_playlist->object_lock ); } else { - if( p_playlist->status.i_status != PLAYLIST_STOPPED && - p_playlist->status.p_item == [[o_outline_view itemAtRow: i_row] pointerValue] ) - { - playlist_Stop( p_playlist ); - } - playlist_LockDelete( p_playlist, p_item->input.i_id ); + playlist_DeleteFromInput( p_playlist, p_item->p_input->i_id, VLC_FALSE ); } } [self playlistUpdated]; @@ -547,20 +896,14 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/ - (IBAction)sortNodeByAuthor:(id)sender { - [self sortNode: SORT_AUTHOR]; + [self sortNode: SORT_ARTIST]; } - (void)sortNode:(int)i_mode { - playlist_t * p_playlist = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); + playlist_t * p_playlist = pl_Yield( VLCIntf ); playlist_item_t * p_item; - if (p_playlist == NULL) - { - return; - } - if( [o_outline_view selectedRow] > -1 ) { p_item = [[o_outline_view itemAtRow: [o_outline_view selectedRow]] @@ -569,8 +912,7 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/ else /*If no item is selected, sort the whole playlist*/ { - playlist_view_t * p_view = playlist_ViewFind( p_playlist, i_current_view ); - p_item = p_view->p_root; + p_item = p_playlist->p_root_category; } if( p_item->i_children > -1 ) // the item is a node @@ -581,35 +923,21 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/ } else { - int i; - - for( i = 0 ; i < p_item->i_parents ; i++ ) - { - if( p_item->pp_parents[i]->i_view == i_current_view ) - { - vlc_mutex_lock( &p_playlist->object_lock ); - playlist_RecursiveNodeSort( p_playlist, - p_item->pp_parents[i]->p_parent, i_mode, ORDER_NORMAL ); - vlc_mutex_unlock( &p_playlist->object_lock ); - break; - } - } + vlc_mutex_lock( &p_playlist->object_lock ); + playlist_RecursiveNodeSort( p_playlist, + p_item->p_parent, i_mode, ORDER_NORMAL ); + vlc_mutex_unlock( &p_playlist->object_lock ); } vlc_object_release( p_playlist ); [self playlistUpdated]; } -- (playlist_item_t *)createItem:(NSDictionary *)o_one_item +- (input_item_t *)createItem:(NSDictionary *)o_one_item { intf_thread_t * p_intf = VLCIntf; - playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); + playlist_t * p_playlist = pl_Yield( p_intf ); - if( p_playlist == NULL ) - { - return NULL; - } - playlist_item_t *p_item; + input_item_t *p_input; int i; BOOL b_rem = FALSE, b_dir = FALSE; NSString *o_uri, *o_name; @@ -634,9 +962,9 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/ 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:NULL range:NSMakeRange(0, [o_temp length]) ]; - [o_temp2 replaceOccurrencesOfString: @"s0" withString: @"" options:NULL range:NSMakeRange(0, [o_temp2 length]) ]; - [o_temp2 replaceOccurrencesOfString: @"s1" withString: @"" options:NULL range:NSMakeRange(0, [o_temp2 length]) ]; + [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]) ]; if( strstr( [o_temp fileSystemRepresentation], [o_temp2 fileSystemRepresentation] ) != NULL ) { @@ -661,21 +989,21 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/ 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:NULL range:NSMakeRange(0, [o_temp length]) ]; - [o_temp replaceOccurrencesOfString: @"s0" withString: @"" options:NULL range:NSMakeRange(0, [o_temp length]) ]; - [o_temp replaceOccurrencesOfString: @"s1" withString: @"" options:NULL range:NSMakeRange(0, [o_temp length]) ]; + [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_uri = o_temp; } - p_item = playlist_ItemNew( p_intf, [o_uri fileSystemRepresentation], [o_name UTF8String] ); - if( !p_item ) + p_input = input_ItemNew( p_playlist, [o_uri fileSystemRepresentation], [o_name UTF8String] ); + if( !p_input ) return NULL; if( o_options ) { for( i = 0; i < (int)[o_options count]; i++ ) { - playlist_ItemAddOption( p_item, strdup( [[o_options objectAtIndex:i] UTF8String] ) ); + input_ItemAddOption( p_input, strdup( [[o_options objectAtIndex:i] UTF8String] ) ); } } @@ -688,135 +1016,97 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/ } vlc_object_release( p_playlist ); - return p_item; + return p_input; } - (void)appendArray:(NSArray*)o_array atPos:(int)i_position enqueue:(BOOL)b_enqueue { int i_item; - playlist_t * p_playlist = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - if( p_playlist == NULL ) - { - return; - } + playlist_t * p_playlist = pl_Yield( VLCIntf ); for( i_item = 0; i_item < (int)[o_array count]; i_item++ ) { - playlist_item_t *p_item; + input_item_t *p_input; NSDictionary *o_one_item; /* Get the item */ o_one_item = [o_array objectAtIndex: i_item]; - p_item = [self createItem: o_one_item]; - if( !p_item ) + p_input = [self createItem: o_one_item]; + if( !p_input ) { continue; } /* Add the item */ - playlist_AddItem( p_playlist, p_item, PLAYLIST_APPEND, i_position == -1 ? PLAYLIST_END : i_position + i_item ); + playlist_AddInput( p_playlist, p_input, PLAYLIST_INSERT, + i_position == -1 ? PLAYLIST_END : i_position + i_item, VLC_TRUE, + VLC_FALSE ); if( i_item == 0 && !b_enqueue ) { - playlist_Control( p_playlist, PLAYLIST_ITEMPLAY, p_item ); + playlist_item_t *p_item; + p_item = playlist_ItemGetByInput( p_playlist, p_input, VLC_TRUE ); + playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, VLC_TRUE, NULL, p_item ); + } + else + { + playlist_item_t *p_item; + p_item = playlist_ItemGetByInput( p_playlist, p_input, VLC_TRUE ); + playlist_Control( p_playlist, PLAYLIST_SKIP, VLC_TRUE, p_item ); } } + [self playlistUpdated]; vlc_object_release( p_playlist ); } -- (void)appendNodeArray:(NSArray*)o_array inNode:(playlist_item_t *)p_node atPos:(int)i_position inView:(int)i_view enqueue:(BOOL)b_enqueue +- (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 = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - if( p_playlist == NULL ) - { - return; - } + playlist_t * p_playlist = pl_Yield( VLCIntf ); for( i_item = 0; i_item < (int)[o_array count]; i_item++ ) { - playlist_item_t *p_item; + input_item_t *p_input; NSDictionary *o_one_item; /* Get the item */ o_one_item = [o_array objectAtIndex: i_item]; - p_item = [self createItem: o_one_item]; - if( !p_item ) + p_input = [self createItem: o_one_item]; + if( !p_input ) { continue; } /* Add the item */ - playlist_NodeAddItem( p_playlist, p_item, i_view, p_node, PLAYLIST_APPEND, i_position + i_item ); + playlist_NodeAddInput( p_playlist, p_input, p_node, + PLAYLIST_INSERT, + i_position == -1 ? + PLAYLIST_END : i_position + i_item, VLC_FALSE ); + if( i_item == 0 && !b_enqueue ) { - playlist_Control( p_playlist, PLAYLIST_ITEMPLAY, p_item ); + playlist_item_t *p_item; + p_item = playlist_ItemGetByInput( p_playlist, p_input, VLC_TRUE ); + playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, VLC_TRUE, NULL, p_item ); + } + else + { + playlist_item_t *p_item; + p_item = playlist_ItemGetByInput( p_playlist, p_input, VLC_TRUE ); + playlist_Control( p_playlist, PLAYLIST_SKIP, VLC_TRUE, p_item ); } } + [self playlistUpdated]; vlc_object_release( p_playlist ); - -} - -- (IBAction)handlePopUp:(id)sender - -{ - intf_thread_t * p_intf = VLCIntf; - vlc_value_t val1,val2; - playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - if( p_playlist == NULL ) - { - return; - } - - switch( [o_loop_popup indexOfSelectedItem] ) - { - case 1: - - val1.b_bool = 0; - var_Set( p_playlist, "loop", val1 ); - val1.b_bool = 1; - var_Set( p_playlist, "repeat", val1 ); - vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Repeat One" ) ); - break; - - case 2: - val1.b_bool = 0; - var_Set( p_playlist, "repeat", val1 ); - val1.b_bool = 1; - var_Set( p_playlist, "loop", val1 ); - vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Repeat All" ) ); - break; - - default: - var_Get( p_playlist, "repeat", &val1 ); - var_Get( p_playlist, "loop", &val2 ); - if( val1.b_bool || val2.b_bool ) - { - val1.b_bool = 0; - var_Set( p_playlist, "repeat", val1 ); - var_Set( p_playlist, "loop", val1 ); - vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Repeat Off" ) ); - } - break; - } - vlc_object_release( p_playlist ); - [self playlistUpdated]; } - (NSMutableArray *)subSearchItem:(playlist_item_t *)p_item { - playlist_t *p_playlist = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); + playlist_t *p_playlist = pl_Yield( VLCIntf ); playlist_item_t *p_selected_item; int i_current, i_selected_row; - if( !p_playlist ) - return NULL; - i_selected_row = [o_outline_view selectedRow]; if (i_selected_row < 0) i_selected_row = 0; @@ -831,9 +1121,9 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/ vlc_mutex_lock( &p_playlist->object_lock ); o_current_name = [NSString stringWithUTF8String: - p_item->pp_children[i_current]->input.psz_name]; - psz_temp = vlc_input_item_GetInfo( &p_item->input , - _("Meta-information"),_("Artist") ); + 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 ); @@ -880,9 +1170,7 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/ - (IBAction)searchItem:(id)sender { - playlist_t * p_playlist = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - playlist_view_t * p_view; + playlist_t * p_playlist = pl_Yield( VLCIntf ); id o_result; unsigned int i; @@ -890,42 +1178,60 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/ b_selected_item_met = NO; - if( p_playlist == NULL ) - return; - p_view = playlist_ViewFind( p_playlist, i_current_view ); - - if( p_view ) - { /*First, only search after the selected item:* *(b_selected_item_met = NO) */ - o_result = [self subSearchItem:p_view->p_root]; - if( o_result == NULL ) - { - /* If the first search failed, search again from the beginning */ - o_result = [self subSearchItem:p_view->p_root]; - } - if( o_result != NULL ) - { - for( i = 0 ; i < [o_result count] - 1 ; i++ ) - { - [o_outline_view expandItem: [o_outline_dict objectForKey: - [NSString stringWithFormat: @"%p", - [[o_result objectAtIndex: i] pointerValue]]]]; - } - i_row = [o_outline_view rowForItem: [o_outline_dict objectForKey: - [NSString stringWithFormat: @"%p", - [[o_result objectAtIndex: [o_result count] - 1 ] - pointerValue]]]]; - } - if( i_row > -1 ) + o_result = [self subSearchItem:p_playlist->p_root_category]; + if( o_result == NULL ) + { + /* If the first search failed, search again from the beginning */ + o_result = [self subSearchItem:p_playlist->p_root_category]; + } + if( o_result != NULL ) + { + int i_start; + if( [[o_result objectAtIndex: 0] pointerValue] == + p_playlist->p_local_category ) + i_start = 1; + else + i_start = 0; + + for( i = i_start ; i < [o_result count] - 1 ; i++ ) { - [o_outline_view selectRow:i_row byExtendingSelection: NO]; - [o_outline_view scrollRowToVisible: i_row]; + [o_outline_view expandItem: [o_outline_dict objectForKey: + [NSString stringWithFormat: @"%p", + [[o_result objectAtIndex: i] pointerValue]]]]; } + i_row = [o_outline_view rowForItem: [o_outline_dict objectForKey: + [NSString stringWithFormat: @"%p", + [[o_result objectAtIndex: [o_result count] - 1 ] + pointerValue]]]]; + } + if( i_row > -1 ) + { + [o_outline_view selectRow:i_row byExtendingSelection: NO]; + [o_outline_view scrollRowToVisible: i_row]; } vlc_object_release( p_playlist ); } +- (IBAction)recursiveExpandNode:(id)sender +{ + 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] ) + { + o_item = [o_outline_dict objectForKey: [NSString + stringWithFormat: @"%p", p_item->p_parent]]; + } + + /* 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; @@ -942,30 +1248,22 @@ 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_preparse 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 { int i_mode = 0, i_type; intf_thread_t *p_intf = VLCIntf; - playlist_view_t *p_view; - playlist_t *p_playlist = (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - if( p_playlist == NULL ) - { - return; - } - + playlist_t *p_playlist = pl_Yield( 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 ) ) @@ -974,8 +1272,6 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/ return; } - p_view = playlist_ViewFind( p_playlist, i_current_view ); - if( o_tc_sortColumn == o_tc ) { b_isSortDescending = !b_isSortDescending; @@ -991,7 +1287,7 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/ } else if( o_tc == o_tc_author ) { - i_mode = SORT_AUTHOR; + i_mode = SORT_ARTIST; } if( b_isSortDescending ) @@ -1004,7 +1300,7 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/ } vlc_mutex_lock( &p_playlist->object_lock ); - playlist_RecursiveNodeSort( p_playlist, p_view->p_root, i_mode, i_type ); + playlist_RecursiveNodeSort( p_playlist, p_playlist->p_root_category, i_mode, i_type ); vlc_mutex_unlock( &p_playlist->object_lock ); vlc_object_release( p_playlist ); @@ -1031,15 +1327,16 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/ forTableColumn:(NSTableColumn *)tableColumn item:(id)item { - playlist_t *p_playlist = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - playlist_item_t *p_item = (playlist_item_t *)[item pointerValue]; + playlist_t *p_playlist = pl_Yield( VLCIntf ); + + id o_playing_item; - if( !p_playlist ) return; + o_playing_item = [o_outline_dict objectForKey: + [NSString stringWithFormat:@"%p", p_playlist->status.p_item]]; - if( ( p_item == p_playlist->status.p_item ) || - ( p_item->i_children != 0 && - [self isItem: p_playlist->status.p_item inNode: p_item] ) ) + if( [self isItem: [o_playing_item pointerValue] inNode: + [item pointerValue] checkItemExistence: YES] + || [o_playing_item isEqual: item] ) { [cell setFont: [NSFont boldSystemFontOfSize: 0]]; } @@ -1050,229 +1347,287 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/ vlc_object_release( p_playlist ); } -@end - -@implementation VLCPlaylist (NSOutlineViewDataSource) +- (IBAction)addNode:(id)sender +{ + /* 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]; +} -/* return the number of children for Obj-C pointer item */ /* DONE */ -- (int)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item +- (void)addNodeThreadedly { - 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; + NSAutoreleasePool * ourPool = [[NSAutoreleasePool alloc] init]; - 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; - } - else + /* simply adds a new node to the end of the playlist */ + playlist_t * p_playlist = pl_Yield( 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( psz_name != NULL && psz_name != "" ) + p_item = playlist_NodeCreate( p_playlist, psz_name, + p_playlist->p_local_category, 0, NULL ); + else if(! config_GetInt( p_playlist, "interact" ) ) { - playlist_item_t *p_item = (playlist_item_t *)[item pointerValue]; - if( p_item ) - i_return = p_item->i_children; + /* in case that the interaction is disabled, just give it a bogus name */ + p_item = playlist_NodeCreate( p_playlist, _("Empty Folder"), + p_playlist->p_local_category, 0, NULL ); } + + if(! p_item ) + msg_Warn( VLCIntf, "node creation failed or cancelled by user" ); + vlc_object_release( p_playlist ); - - if( i_return <= 0 ) - i_return = 0; - - return i_return; + [ourPool release]; } -/* return the child at index for the Obj-C pointer item */ /* DONE */ +@end + +@implementation VLCPlaylist (NSOutlineViewDataSource) + - (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 = pl_Yield( VLCIntf ); - 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 && index < p_view->p_root->i_children && index >= 0 ) - p_return = p_view->p_root->pp_children[index]; - } - 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 ) + if( playlist_CurrentSize( p_playlist ) >= 2 ) { [o_status_field setStringValue: [NSString stringWithFormat: - _NS("%i items in playlist"), p_playlist->i_size]]; + _NS("%i items in the playlist"), + playlist_CurrentSize( p_playlist )]]; } else { - if( p_playlist->i_size == 0 ) + if( playlist_IsEmpty( p_playlist ) ) { - [o_status_field setStringValue: [NSString stringWithFormat: - _NS("no items in playlist"), p_playlist->i_size]]; + [o_status_field setStringValue: _NS("No items in the playlist")]; } else { - [o_status_field setStringValue: [NSString stringWithFormat: - _NS("1 item in playlist"), p_playlist->i_size]]; + [o_status_field setStringValue: _NS("1 item in the playlist")]; } } - vlc_object_release( p_playlist ); - o_value = [[NSValue valueWithPointer: p_return] retain]; - - [o_outline_dict setObject:o_value forKey:[NSString stringWithFormat:@"%p", p_return]]; + [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; + } -/* is the item expandable */ -- (BOOL)outlineView:(NSOutlineView *)outlineView isItemExpandable:(id)item +/* Required for drag & drop and reordering */ +- (BOOL)outlineView:(NSOutlineView *)outlineView writeItems:(NSArray *)items toPasteboard:(NSPasteboard *)pboard { - int i_return = 0; - playlist_t * p_playlist = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - if( p_playlist == NULL ) - return NO; + unsigned int i; + playlist_t *p_playlist = pl_Yield( VLCIntf ); - 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; - } - else + /* First remove the items that were moved during the last drag & drop + operation */ + [o_items_array removeAllObjects]; + [o_nodes_array removeAllObjects]; + + for( i = 0 ; i < [items count] ; i++ ) { - playlist_item_t *p_item = (playlist_item_t *)[item pointerValue]; - if( p_item ) - i_return = p_item->i_children; + id o_item = [items objectAtIndex: i]; + + /* 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]) + { + 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]; } - vlc_object_release( p_playlist ); - if( i_return <= 0 ) - return NO; - else - return YES; + /* 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]; + + /* We add the "VLCPlaylistItemPboardType" type to be able to recognize + a Drop operation coming from the playlist. */ + + [pboard declareTypes: [NSArray arrayWithObjects: + @"VLCPlaylistItemPboardType", nil] owner: self]; + [pboard setData:[NSData data] forType:@"VLCPlaylistItemPboardType"]; + + vlc_object_release(p_playlist); + return YES; } -/* retrieve the string values for the cells */ -- (id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTableColumn *)o_tc byItem:(id)item +- (NSDragOperation)outlineView:(NSOutlineView *)outlineView validateDrop:(id )info proposedItem:(id)item proposedChildIndex:(int)index { - 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 ) + playlist_t *p_playlist = pl_Yield( VLCIntf ); + NSPasteboard *o_pasteboard = [info draggingPasteboard]; + + if( !p_playlist ) return NSDragOperationNone; + + /* Dropping ON items is not allowed if item is not a node */ + if( item ) { - return( @"error" ); + if( index == NSOutlineViewDropOnItemIndex && + ((playlist_item_t *)[item pointerValue])->i_children == -1 ) + { + vlc_object_release( p_playlist ); + return NSDragOperationNone; + } } - p_item = (playlist_item_t *)[item pointerValue]; - - if( p_item == NULL ) + /* Don't allow on drop on playlist root element's child */ + if( !item && index != NSOutlineViewDropOnItemIndex) { vlc_object_release( p_playlist ); - return( @"error"); + return NSDragOperationNone; } - if( [[o_tc identifier] isEqualToString:@"1"] ) + /* 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) ) { - o_value = [NSString stringWithUTF8String: - p_item->input.psz_name]; - if( o_value == NULL ) - o_value = [NSString stringWithCString: - p_item->input.psz_name]; + vlc_object_release( p_playlist ); + return NSDragOperationNone; } - 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 + /* Drop from the Playlist */ + if( [[o_pasteboard types] containsObject: @"VLCPlaylistItemPboardType"] ) + { + unsigned int i; + for( i = 0 ; i < [o_nodes_array count] ; i++ ) { - o_value = [NSString stringWithUTF8String: psz_temp]; - if( o_value == NULL ) + /* 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] ) { - o_value = [NSString stringWithCString: psz_temp]; + vlc_object_release( p_playlist ); + return NSDragOperationNone; } - free( psz_temp ); } + vlc_object_release( p_playlist ); + return NSDragOperationMove; } - else if( [[o_tc identifier] isEqualToString:@"3"] ) + + /* Drop from the Finder */ + else if( [[o_pasteboard types] containsObject: NSFilenamesPboardType] ) { - 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 NSDragOperationGeneric; } vlc_object_release( p_playlist ); - - return( o_value ); + return NSDragOperationNone; } -/* Required for drag & drop and reordering */ -- (BOOL)outlineView:(NSOutlineView *)outlineView writeItems:(NSArray *)items toPasteboard:(NSPasteboard *)pboard +- (BOOL)outlineView:(NSOutlineView *)outlineView acceptDrop:(id )info item:(id)item childIndex:(int)index { -/* unsigned int i; + playlist_t * p_playlist = pl_Yield( VLCIntf ); + NSPasteboard *o_pasteboard = [info draggingPasteboard]; - for( i = 0 ; i < [items count] ; i++ ) - { - if( [outlineView levelForItem: [items objectAtIndex: i]] == 0 ) + /* Drag & Drop inside the playlist */ + if( [[o_pasteboard types] containsObject: @"VLCPlaylistItemPboardType"] ) + { + int i_row, i_removed_from_node = 0; + 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_local_category; + else p_new_parent = [item pointerValue]; + + /* Make sure the proposed parent is a node. + (This should never be true) */ + if( p_new_parent->i_children < 0 ) { + vlc_object_release( p_playlist ); return NO; } - }*/ - return NO; -} -- (NSDragOperation)outlineView:(NSOutlineView *)outlineView validateDrop:(id )info proposedItem:(id)item proposedChildIndex:(int)index -{ - NSPasteboard *o_pasteboard = [info draggingPasteboard]; + for( i = 0; i < [o_all_items count]; i++ ) + { + playlist_item_t *p_old_parent = NULL; + int i_old_index = 0; - if( [[o_pasteboard types] containsObject: NSFilenamesPboardType] ) - { - return NSDragOperationGeneric; - } - return NSDragOperationNone; -} + p_item = [[o_all_items objectAtIndex:i] pointerValue]; + p_old_parent = p_item->p_parent; + 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; + } + } + } -- (BOOL)outlineView:(NSOutlineView *)outlineView acceptDrop:(id )info item:(id)item childIndex:(int)index -{ - playlist_t * p_playlist = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - NSPasteboard *o_pasteboard = [info draggingPasteboard]; + 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 ) + { + 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) ) + { + i_removed_from_node++; + } + i_new_index = index + i - i_removed_from_node; + } + // 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 ); + } + [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]]]; + } - if( !p_playlist ) return NO; + [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; + } - if( [[o_pasteboard types] containsObject: NSFilenamesPboardType] ) + else if( [[o_pasteboard types] containsObject: NSFilenamesPboardType] ) { int i; playlist_item_t *p_node = [item pointerValue]; @@ -1295,30 +1650,16 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/ { [self appendArray: o_array atPos: index enqueue: YES]; } + /* This should never occur */ else if( p_node->i_children == -1 ) { - int i_counter; - playlist_item_t *p_real_node = NULL; - - for( i_counter = 0 ; i_counter < p_node->i_parents ; i_counter++ ) - { - if( p_node->pp_parents[i_counter]->i_view == i_current_view ) - { - p_real_node = p_node->pp_parents[i_counter]->p_parent; - break; - } - if( i_counter == p_node->i_parents ) - { - return NO; - } - } - [self appendNodeArray: o_array inNode: p_real_node - atPos: index inView: i_current_view enqueue: YES]; + vlc_object_release( p_playlist ); + return NO; } else { [self appendNodeArray: o_array inNode: p_node - atPos: index inView: i_current_view enqueue: YES]; + atPos: index enqueue: YES]; } vlc_object_release( p_playlist ); return YES;