X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fplaylist.m;h=ae095c962a0ca54c86f641e375335d077e093dd8;hb=9c1a53ac71e4edb312b5fe7123163aa223a55c20;hp=b81915c079f6e034476ba58265dc6e25349d925c;hpb=11947665eae998328705adc80d86bf9db64c4bc1;p=vlc diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m index b81915c079..ae095c962a 100644 --- a/modules/gui/macosx/playlist.m +++ b/modules/gui/macosx/playlist.m @@ -1,7 +1,7 @@ /***************************************************************************** * playlist.m: MacOS X interface module ***************************************************************************** -* Copyright (C) 2002-2006 the VideoLAN team +* Copyright (C) 2002-2008 the VideoLAN team * $Id$ * * Authors: Jon Lech Johansen @@ -25,7 +25,6 @@ /* TODO * add 'icons' for different types of nodes? (http://www.cocoadev.com/index.pl?IconAndTextInTableCell) - * create toggle buttons for the shuffle, repeat one, repeat all functions. * reimplement enable/disable item * create a new 'tool' button (see the gear button in the Finder window) for 'actions' (adding service discovery, other views, new node/playlist, save node/playlist) stuff like that @@ -50,10 +49,10 @@ #import "controls.h" #import "vlc_osd.h" #import "misc.h" -#import +#import /***************************************************************************** - * VLCPlaylistView implementation + * VLCPlaylistView implementation *****************************************************************************/ @implementation VLCPlaylistView @@ -82,8 +81,7 @@ case NSEnterCharacter: case NSCarriageReturnCharacter: - [(VLCPlaylist *)[[VLCMain sharedInstance] getPlaylist] - playItem:self]; + [(VLCPlaylist *)[[VLCMain sharedInstance] getPlaylist] playItem:self]; break; default: @@ -167,13 +165,10 @@ p_item = (playlist_item_t *)[item pointerValue]; } if( p_item ) - i_return = p_item->i_children; + i_return = p_item->i_children; vlc_object_release( p_playlist ); - if( i_return <= 0 ) - i_return = 0; -NSLog( @"%d children for %s", i_return, p_item->p_input->psz_name ); - return i_return; + return i_return > 0 ? i_return : 0; } /* return the child at index for the Obj-C pointer item */ /* DONE */ @@ -190,21 +185,19 @@ NSLog( @"%d children for %s", i_return, p_item->p_input->psz_name ); } else { - p_item = (playlist_item_t *)[item pointerValue]; + p_item = (playlist_item_t *)[item pointerValue]; } if( p_item && index < p_item->i_children && index >= 0 ) p_return = p_item->pp_children[index]; - + vlc_object_release( p_playlist ); o_value = [o_outline_dict objectForKey:[NSString stringWithFormat: @"%p", p_return]]; - #if 0 - NSLog( @"%s", p_return->p_input->psz_name); - #endif + if( o_value == nil ) { + msg_Warn( VLCIntf, "playlist item misses pointer value, adding one" ); o_value = [[NSValue valueWithPointer: p_return] retain]; - msg_Err( VLCIntf, "missing playlist item's pointer value" ); } return o_value; } @@ -231,59 +224,86 @@ NSLog( @"%d children for %s", i_return, p_item->p_input->psz_name ); } vlc_object_release( p_playlist ); -NSLog( @"expandable" ); - if( i_return <= 0 ) - return NO; - else - return YES; + return (i_return > 0); } /* retrieve the string values for the cells */ - (id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTableColumn *)o_tc byItem:(id)item { id o_value = nil; - intf_thread_t *p_intf = VLCIntf; playlist_item_t *p_item; - - if( item == nil || ![item isKindOfClass: [NSValue class]] ) return( @"error" ); - - p_item = (playlist_item_t *)[item pointerValue]; - if( p_item == NULL ) + + /* For error handling */ + static BOOL attempted_reload = NO; + + if( item == nil || ![item isKindOfClass: [NSValue class]] ) { - return( @"error"); + /* Attempt to fix the error by asking for a data redisplay + * This might cause infinite loop, so add a small check */ + if( !attempted_reload ) + { + attempted_reload = YES; + [outlineView reloadData]; + } + return @"error" ; } -//NSLog( @"values for %p", p_item ); - - if( [[o_tc identifier] isEqualToString:@"1"] ) + + p_item = (playlist_item_t *)[item pointerValue]; + if( !p_item || !p_item->p_input ) { - o_value = [NSString stringWithUTF8String: - p_item->p_input->psz_name]; - if( o_value == NULL ) - o_value = [NSString stringWithCString: - p_item->p_input->psz_name]; + /* 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"; } - else if( [[o_tc identifier] isEqualToString:@"2"] && p_item->p_input->p_meta && - p_item->p_input->p_meta->psz_artist && *p_item->p_input->p_meta->psz_artist ) + + attempted_reload = NO; + + if( [[o_tc identifier] isEqualToString:@"1"] ) { - o_value = [NSString stringWithUTF8String: - p_item->p_input->p_meta->psz_artist]; - if( o_value == NULL ) - o_value = [NSString stringWithCString: - p_item->p_input->p_meta->psz_artist]; + /* sanity check to prevent the NSString class from crashing */ + char *psz_title = input_item_GetTitle( p_item->p_input ); + if( !EMPTY_STR( psz_title ) ) + { + o_value = [NSString stringWithUTF8String: psz_title]; + } + else + { + char *psz_name = input_item_GetName( p_item->p_input ); + if( psz_name != NULL ) + { + o_value = [NSString stringWithUTF8String: psz_name]; + } + free( psz_name ); + } + free( psz_title ); } - else if( [[o_tc identifier] isEqualToString:@"3"] ) + else { - char psz_duration[MSTRTIME_MAX_SIZE]; - mtime_t dur = p_item->p_input->i_duration; - if( dur != -1 ) + char *psz_artist = input_item_GetArtist( p_item->p_input ); + if( [[o_tc identifier] isEqualToString:@"2"] && !EMPTY_STR( psz_artist ) ) { - secstotimestr( psz_duration, dur/1000000 ); - o_value = [NSString stringWithUTF8String: psz_duration]; + o_value = [NSString stringWithUTF8String: psz_artist]; } - else + else if( [[o_tc identifier] isEqualToString:@"3"] ) { - o_value = @"-:--:--"; + 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 ); @@ -340,10 +360,8 @@ NSLog( @"expandable" ); - (void)awakeFromNib { playlist_t * p_playlist = pl_Yield( VLCIntf ); - vlc_list_t *p_list = vlc_list_find( p_playlist, VLC_OBJECT_MODULE, - FIND_ANYWHERE ); - int i_index; + int i; [super awakeFromNib]; @@ -354,60 +372,57 @@ NSLog( @"expandable" ); @"VLCPlaylistItemPboardType", nil]]; [o_outline_view setIntercellSpacing: NSMakeSize (0.0, 1.0)]; - /* this uses private Apple API which works fine until 10.4, - * but keep checking in the future! + /* This uses private Apple API which works fine until 10.4. + * We need to keep checking in the future! * These methods are being added artificially to NSOutlineView's interface above */ o_ascendingSortingImage = [[NSOutlineView class] _defaultTableHeaderSortImage]; o_descendingSortingImage = [[NSOutlineView class] _defaultTableHeaderReverseSortImage]; o_tc_sortColumn = nil; - for( i_index = 0; i_index < p_list->i_count; i_index++ ) + char ** ppsz_name; + char ** ppsz_services = services_discovery_GetServicesNames( p_playlist, &ppsz_name ); + if( !ppsz_services ) + { + vlc_object_release( p_playlist ); + return; + } + + for( i = 0; ppsz_services[i]; i++ ) { 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" ) ) - { - /* Check for submodules */ - int i = -1; - while( p_parser->pp_shortcuts[++i] != NULL ); i--; - - /* Check whether to enable these menuitems */ - objectname = i>=0 ? p_parser->pp_shortcuts[i] : 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: - objectname)] - action: @selector(servicesChange:) - keyEquivalent: @""]; - [o_lmi setTarget: self]; - [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: - objectname)] - action: @selector(servicesChange:) - keyEquivalent: @""]; - [o_lmi setTarget: self]; - [o_lmi setRepresentedObject: [NSString stringWithCString:objectname]]; - if( b_enabled ) [o_lmi setState: NSOnState]; - } - } - vlc_list_release( p_list ); - vlc_object_release( p_playlist ); + char * name = ppsz_name[i] ? ppsz_name[i] : ppsz_services[i]; + /* Check whether to enable these menuitems */ + 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: name] + action: @selector(servicesChange:) + keyEquivalent: @""]; + [o_lmi setTarget: self]; + [o_lmi setRepresentedObject: [NSString stringWithUTF8String: ppsz_services[i]]]; + if( b_enabled ) [o_lmi setState: NSOnState]; + + /* Create the menu entries for the main menu */ + o_lmi = [[o_mm_mi_services submenu] addItemWithTitle: + [NSString stringWithUTF8String: name] + action: @selector(servicesChange:) + keyEquivalent: @""]; + [o_lmi setTarget: self]; + [o_lmi setRepresentedObject: [NSString stringWithUTF8String: ppsz_services[i]]]; + if( b_enabled ) [o_lmi setState: NSOnState]; + + free( ppsz_services[i] ); + free( ppsz_name[i] ); + } + free( ppsz_services ); + free( ppsz_name ); - //[self playlistUpdated]; + vlc_object_release( p_playlist ); } - (void)searchfieldChanged:(NSNotification *)o_notification @@ -429,12 +444,8 @@ NSLog( @"expandable" ); [o_mi_sort_name setTitle: _NS("Sort Node by Name")]; [o_mi_sort_author setTitle: _NS("Sort Node by Author")]; [o_mi_services setTitle: _NS("Services discovery")]; - [o_status_field setStringValue: [NSString stringWithFormat: - _NS("No items in the playlist")]]; + [o_status_field setStringValue: _NS("No items in the playlist")]; -#if 0 - [o_search_button setTitle: _NS("Search")]; -#endif [o_search_field setToolTip: _NS("Search in Playlist")]; [o_mi_addNode setTitle: _NS("Add Folder to Playlist")]; @@ -464,21 +475,18 @@ NSLog( @"expandable" ); playlist_t *p_playlist = pl_Yield( VLCIntf ); - if( p_playlist->i_size >= 2 ) + if( playlist_CurrentSize( p_playlist ) >= 2 ) { [o_status_field setStringValue: [NSString stringWithFormat: - _NS("%i items in the playlist"), p_playlist->i_size]]; + _NS("%i items in the playlist"), + playlist_CurrentSize( p_playlist )]]; } else { - if( p_playlist->i_size == 0 ) - { + if( playlist_IsEmpty( p_playlist ) ) [o_status_field setStringValue: _NS("No items in the playlist")]; - } else - { [o_status_field setStringValue: _NS("1 item in the playlist")]; - } } vlc_object_release( p_playlist ); } @@ -529,14 +537,6 @@ NSLog( @"expandable" ); { [o_array insertObject: [NSValue valueWithPointer: p_temp_item] atIndex: 0]; p_temp_item = p_temp_item->p_parent; - /*for (i = 0 ; i < p_temp_item->i_parents ; i++) - { - if( p_temp_item->pp_parents[i]->i_view == i_current_view ) - { - p_temp_item = p_temp_item->pp_parents[i]->p_parent; - break; - } - }*/ } for( j = 0; j < [o_array count] - 1; j++ ) @@ -551,12 +551,6 @@ NSLog( @"expandable" ); } - i_row = [o_outline_view rowForItem:[o_outline_dict - objectForKey:[NSString stringWithFormat: @"%p", p_item]]]; - - [o_outline_view selectRow: i_row byExtendingSelection: NO]; - [o_outline_view scrollRowToVisible: i_row]; - vlc_object_release( p_playlist ); /* update our info-panel to reflect the new item */ @@ -597,10 +591,10 @@ NSLog( @"expandable" ); /* Since outlineView: willDisplayCell:... may call this function with p_items that don't exist anymore, first check if the item is still in the playlist. Any cleaner solution welcomed. */ - for( i = 0; i < p_playlist->i_all_size; i++ ) + for( i = 0; i < p_playlist->all_items.i_size; i++ ) { - if( p_playlist->pp_all_items[i] == p_item ) break; - else if ( i == p_playlist->i_all_size - 1 ) + if( ARRAY_VAL( p_playlist->all_items, i) == p_item ) break; + else if ( i == p_playlist->all_items.i_size - 1 ) { vlc_object_release( p_playlist ); vlc_mutex_unlock( &p_playlist->object_lock ); @@ -656,8 +650,7 @@ NSLog( @"expandable" ); - (IBAction)savePlaylist:(id)sender { - intf_thread_t * p_intf = VLCIntf; - playlist_t * p_playlist = pl_Yield( p_intf ); + playlist_t * p_playlist = pl_Yield( VLCIntf ); NSSavePanel *o_save_panel = [NSSavePanel savePanel]; NSString * o_name = [NSString stringWithFormat: @"%@", _NS("Untitled")]; @@ -688,8 +681,8 @@ NSLog( @"expandable" ); { o_real_filename = o_filename; } - playlist_Export( p_playlist, - [o_real_filename fileSystemRepresentation], + playlist_Export( p_playlist, + [o_real_filename fileSystemRepresentation], p_playlist->p_local_category, "export-xspf" ); } else @@ -708,7 +701,7 @@ NSLog( @"expandable" ); { o_real_filename = o_filename; } - playlist_Export( p_playlist, + playlist_Export( p_playlist, [o_real_filename fileSystemRepresentation], p_playlist->p_local_category, "export-m3u" ); } @@ -746,7 +739,7 @@ NSLog( @"expandable" ); p_item = NULL; } } - playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, p_node, p_item ); + playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, VLC_TRUE, p_node, p_item ); } vlc_object_release( p_playlist ); } @@ -758,7 +751,7 @@ NSLog( @"expandable" ); NSMutableArray *o_to_preparse; intf_thread_t * p_intf = VLCIntf; playlist_t * p_playlist = pl_Yield( p_intf ); - + o_to_preparse = [NSMutableArray arrayWithArray:[[o_outline_view selectedRowEnumerator] allObjects]]; i_count = [o_to_preparse count]; @@ -782,7 +775,7 @@ NSLog( @"expandable" ); } else { - msg_Dbg( p_intf, "preparse of nodes not yet implemented" ); + msg_Dbg( p_intf, "preparsing nodes not implemented" ); } } } @@ -795,13 +788,13 @@ NSLog( @"expandable" ); NSMenuItem *o_mi = (NSMenuItem *)sender; NSString *o_string = [o_mi representedObject]; playlist_t * p_playlist = pl_Yield( VLCIntf ); - if( !playlist_IsServicesDiscoveryLoaded( p_playlist, [o_string cString] ) ) - playlist_ServicesDiscoveryAdd( p_playlist, [o_string cString] ); + if( !playlist_IsServicesDiscoveryLoaded( p_playlist, [o_string UTF8String] ) ) + playlist_ServicesDiscoveryAdd( p_playlist, [o_string UTF8String] ); else - playlist_ServicesDiscoveryRemove( p_playlist, [o_string cString] ); + playlist_ServicesDiscoveryRemove( p_playlist, [o_string UTF8String] ); [o_mi setState: playlist_IsServicesDiscoveryLoaded( p_playlist, - [o_string cString] ) ? YES : NO]; + [o_string UTF8String] ) ? YES : NO]; vlc_object_release( p_playlist ); [self playlistUpdated]; @@ -854,7 +847,7 @@ NSLog( @"expandable" ); } else { - playlist_LockDelete( p_playlist, p_item->i_id ); + playlist_DeleteFromInput( p_playlist, p_item->p_input->i_id, VLC_FALSE ); } } [self playlistUpdated]; @@ -878,8 +871,7 @@ NSLog( @"expandable" ); if( [o_outline_view selectedRow] > -1 ) { - p_item = [[o_outline_view itemAtRow: [o_outline_view selectedRow]] - pointerValue]; + p_item = [[o_outline_view itemAtRow: [o_outline_view selectedRow]] pointerValue]; } else /*If no item is selected, sort the whole playlist*/ @@ -933,14 +925,14 @@ NSLog( @"expandable" ); { NSMutableString *o_temp, *o_temp2; o_temp = [NSMutableString stringWithString: o_uri]; - o_temp2 = [NSMutableString stringWithCString: mounts[i_index].f_mntfromname]; - [o_temp replaceOccurrencesOfString: @"/dev/rdisk" withString: @"/dev/disk" options:nil range:NSMakeRange(0, [o_temp length]) ]; - [o_temp2 replaceOccurrencesOfString: @"s0" withString: @"" options:nil range:NSMakeRange(0, [o_temp2 length]) ]; - [o_temp2 replaceOccurrencesOfString: @"s1" withString: @"" options:nil range:NSMakeRange(0, [o_temp2 length]) ]; + o_temp2 = [NSMutableString stringWithUTF8String: mounts[i_index].f_mntfromname]; + [o_temp replaceOccurrencesOfString: @"/dev/rdisk" withString: @"/dev/disk" options:NSLiteralSearch range:NSMakeRange(0, [o_temp length]) ]; + [o_temp2 replaceOccurrencesOfString: @"s0" withString: @"" options:NSLiteralSearch range:NSMakeRange(0, [o_temp2 length]) ]; + [o_temp2 replaceOccurrencesOfString: @"s1" withString: @"" options:NSLiteralSearch range:NSMakeRange(0, [o_temp2 length]) ]; if( strstr( [o_temp fileSystemRepresentation], [o_temp2 fileSystemRepresentation] ) != NULL ) { - o_name = [[NSFileManager defaultManager] displayNameAtPath: [NSString stringWithCString:mounts[i_index].f_mntonname]]; + o_name = [[NSFileManager defaultManager] displayNameAtPath: [NSString stringWithUTF8String:mounts[i_index].f_mntonname]]; } } } @@ -960,10 +952,10 @@ NSLog( @"expandable" ); buf = (struct statfs *) malloc (sizeof(struct statfs)); statfs( [o_uri fileSystemRepresentation], buf ); psz_dev = strdup(buf->f_mntfromname); - o_temp = [NSMutableString stringWithCString: psz_dev ]; - [o_temp replaceOccurrencesOfString: @"/dev/disk" withString: @"/dev/rdisk" options:nil range:NSMakeRange(0, [o_temp length]) ]; - [o_temp replaceOccurrencesOfString: @"s0" withString: @"" options:nil range:NSMakeRange(0, [o_temp length]) ]; - [o_temp replaceOccurrencesOfString: @"s1" withString: @"" options:nil range:NSMakeRange(0, [o_temp length]) ]; + o_temp = [NSMutableString stringWithUTF8String: psz_dev ]; + [o_temp replaceOccurrencesOfString: @"/dev/disk" withString: @"/dev/rdisk" options:NSLiteralSearch range:NSMakeRange(0, [o_temp length]) ]; + [o_temp replaceOccurrencesOfString: @"s0" withString: @"" options:NSLiteralSearch range:NSMakeRange(0, [o_temp length]) ]; + [o_temp replaceOccurrencesOfString: @"s1" withString: @"" options:NSLiteralSearch range:NSMakeRange(0, [o_temp length]) ]; o_uri = o_temp; } @@ -981,7 +973,7 @@ NSLog( @"expandable" ); /* Recent documents menu */ o_true_file = [NSURL fileURLWithPath: o_uri]; - if( o_true_file != nil ) + if( o_true_file != nil && (BOOL)config_GetInt( p_playlist, "macosx-recentitems" ) == YES ) { [[NSDocumentController sharedDocumentController] noteNewRecentDocumentURL: o_true_file]; @@ -1010,20 +1002,21 @@ NSLog( @"expandable" ); } /* Add the item */ - playlist_PlaylistAddInput( p_playlist, p_input, PLAYLIST_INSERT, - 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_item_t *p_item; - p_item = playlist_ItemGetByInput( p_playlist, p_input ); - playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, NULL, 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 ); - playlist_Control( p_playlist, PLAYLIST_PREPARSE, p_item ); + p_item = playlist_ItemGetByInput( p_playlist, p_input, VLC_TRUE ); + playlist_Control( p_playlist, PLAYLIST_SKIP, VLC_TRUE, p_item ); } } [self playlistUpdated]; @@ -1052,20 +1045,20 @@ NSLog( @"expandable" ); playlist_NodeAddInput( p_playlist, p_input, p_node, PLAYLIST_INSERT, i_position == -1 ? - PLAYLIST_END : i_position + i_item ); + PLAYLIST_END : i_position + i_item, VLC_FALSE ); if( i_item == 0 && !b_enqueue ) { playlist_item_t *p_item; - p_item = playlist_ItemGetByInput( p_playlist, p_input ); - playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, NULL, p_item ); + 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 ); - playlist_Control( p_playlist, PLAYLIST_PREPARSE, p_item ); + p_item = playlist_ItemGetByInput( p_playlist, p_input, VLC_TRUE ); + playlist_Control( p_playlist, PLAYLIST_SKIP, VLC_TRUE, p_item ); } } [self playlistUpdated]; @@ -1323,7 +1316,7 @@ NSLog( @"expandable" ); /* we have to create a new thread here because otherwise we would block the * interface since the interaction-stuff and this code would run in the same * thread */ - [NSThread detachNewThreadSelector: @selector(addNodeThreadedly) + [NSThread detachNewThreadSelector: @selector(addNodeThreadedly) toTarget: self withObject:nil]; [self playlistUpdated]; } @@ -1339,17 +1332,21 @@ NSLog( @"expandable" ); int ret_v; char *psz_name = NULL; playlist_item_t * p_item; - ret_v = intf_UserStringInput( p_playlist, _("New Node"), + ret_v = intf_UserStringInput( p_playlist, _("New Node"), _("Please enter a name for the new node."), &psz_name ); + if( psz_name != NULL && psz_name != "" ) - p_item = playlist_NodeCreate( p_playlist, psz_name, - p_playlist->p_local_category ); - else - p_item = playlist_NodeCreate( p_playlist, _("Empty Folder"), - p_playlist->p_local_category ); + p_item = playlist_NodeCreate( p_playlist, psz_name, + p_playlist->p_local_category, 0, NULL ); + else if(! config_GetInt( p_playlist, "interact" ) ) + { + /* in case that the interaction is disabled, just give it a bogus name */ + p_item = playlist_NodeCreate( p_playlist, _("Empty Folder"), + p_playlist->p_local_category, 0, NULL ); + } if(! p_item ) - msg_Warn( VLCIntf, "node creation failed" ); + msg_Warn( VLCIntf, "node creation failed or cancelled by user" ); vlc_object_release( p_playlist ); [ourPool release]; @@ -1364,17 +1361,15 @@ NSLog( @"expandable" ); id o_value = [super outlineView: outlineView child: index ofItem: item]; playlist_t *p_playlist = pl_Yield( VLCIntf ); - /* FIXME: playlist->i_size doesn't provide the correct number of items anymore - * check the playlist API for the fixed function, once zorglub implemented it -- fpk, 9/17/06 */ - - if( p_playlist->i_size >= 2 ) + if( playlist_CurrentSize( p_playlist ) >= 2 ) { [o_status_field setStringValue: [NSString stringWithFormat: - _NS("%i items in the playlist"), p_playlist->i_size]]; + _NS("%i items in the playlist"), + playlist_CurrentSize( p_playlist )]]; } else { - if( p_playlist->i_size == 0 ) + if( playlist_IsEmpty( p_playlist ) ) { [o_status_field setStringValue: _NS("No items in the playlist")]; } @@ -1387,7 +1382,9 @@ NSLog( @"expandable" ); [o_outline_dict setObject:o_value forKey:[NSString stringWithFormat:@"%p", [o_value pointerValue]]]; +#ifdef DEBUG msg_Dbg( VLCIntf, "adding item %p", [o_value pointerValue] ); +#endif return o_value; } @@ -1410,7 +1407,10 @@ NSLog( @"expandable" ); /* Refuse to move items that are not in the General Node (Service Discovery) */ if( ![self isItem: [o_item pointerValue] inNode: - p_playlist->p_local_category checkItemExistence: NO]) + p_playlist->p_local_category checkItemExistence: NO] && + ( var_CreateGetBool( p_playlist, "media-library" ) && + ![self isItem: [o_item pointerValue] inNode: + p_playlist->p_ml_category checkItemExistence: NO]) ) { vlc_object_release(p_playlist); return NO; @@ -1456,11 +1456,18 @@ NSLog( @"expandable" ); } } + /* Don't allow on drop on playlist root element's child */ + if( !item && index != NSOutlineViewDropOnItemIndex) + { + vlc_object_release( p_playlist ); + return NSDragOperationNone; + } + /* We refuse to drop an item in anything else than a child of the General Node. We still accept items that would be root nodes of the outlineview however, to allow drop in an empty playlist. */ - if( !([self isItem: [item pointerValue] inNode: p_playlist->p_local_category - checkItemExistence: NO] || item == nil) ) + if( !( ([self isItem: [item pointerValue] inNode: p_playlist->p_local_category checkItemExistence: NO] || + ( var_CreateGetBool( p_playlist, "media-library" ) && [self isItem: [item pointerValue] inNode: p_playlist->p_ml_category checkItemExistence: NO] ) ) || item == nil ) ) { vlc_object_release( p_playlist ); return NSDragOperationNone; @@ -1629,13 +1636,6 @@ NSLog( @"expandable" ); vlc_object_release( p_playlist ); return NO; } - -/* Delegate method of NSWindow */ -/*- (void)windowWillClose:(NSNotification *)aNotification -{ - [o_btn_playlist setState: NSOffState]; -} -*/ @end