X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fplaylist.m;h=7450e9b712cd3c789af65272457f07f951fa0d5a;hb=d716c3db4433414d4d83c99d8bb4e6d85b14f348;hp=f2562128469fea7e46b35ac4411680d6844b0c18;hpb=2e0eb5c74b941f18521726572abf74bebc8f59bb;p=vlc diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m index f256212846..7450e9b712 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 @@ -53,7 +52,7 @@ #import /***************************************************************************** - * VLCPlaylistView implementation + * VLCPlaylistView implementation *****************************************************************************/ @implementation VLCPlaylistView @@ -82,8 +81,7 @@ case NSEnterCharacter: case NSCarriageReturnCharacter: - [(VLCPlaylist *)[[VLCMain sharedInstance] getPlaylist] - playItem:self]; + [(VLCPlaylist *)[[VLCMain sharedInstance] getPlaylist] playItem:self]; break; default: @@ -94,7 +92,6 @@ @end - /***************************************************************************** * VLCPlaylistCommon implementation * @@ -151,29 +148,19 @@ int i_return = 0; playlist_item_t *p_item = NULL; playlist_t * p_playlist = pl_Yield( VLCIntf ); - if( outlineView != o_outline_view ) - { - vlc_object_release( p_playlist ); - return 0; - } + NSAssert( outlineView != o_outline_view ) - if( item == nil ) - { - /* root object */ + if( !item ) p_item = p_playlist->p_root_category; - } else - { p_item = (playlist_item_t *)[item pointerValue]; - } + if( p_item ) - i_return = p_item->i_children; - vlc_object_release( p_playlist ); + i_return = p_item->i_children; - if( i_return <= 0 ) - i_return = 0; + pl_Release( VLCIntf ); - return i_return; + return i_return > 0 ? i_return : 0; } /* return the child at index for the Obj-C pointer item */ /* DONE */ @@ -190,19 +177,19 @@ } 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( 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; } @@ -252,7 +239,7 @@ } return @"error" ; } - + p_item = (playlist_item_t *)[item pointerValue]; if( !p_item || !p_item->p_input ) { @@ -265,43 +252,50 @@ } return @"error"; } - + attempted_reload = NO; if( [[o_tc identifier] isEqualToString:@"1"] ) { /* sanity check to prevent the NSString class from crashing */ - if( p_item->p_input->psz_name != NULL ) + char *psz_title = input_item_GetTitle( p_item->p_input ); + if( !EMPTY_STR( psz_title ) ) { - o_value = [NSString stringWithUTF8String: - p_item->p_input->psz_name]; - if( o_value == NULL ) - o_value = [NSString stringWithCString: - p_item->p_input->psz_name]; + o_value = [NSString stringWithUTF8String: psz_title]; } + else + { + char *psz_name = input_item_GetName( p_item->p_input ); + if( !EMPTY_STR( psz_name ) ) + { + o_value = [NSString stringWithUTF8String: psz_name]; + } + free( psz_name ); + } + free( psz_title ); } - else 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 ) - { - 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]; - } - 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 ); @@ -358,10 +352,8 @@ - (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]; @@ -372,60 +364,57 @@ @"VLCPlaylistItemPboardType", nil]]; [o_outline_view setIntercellSpacing: NSMakeSize (0.0, 1.0)]; - /* this uses private Apple API which works fine until 10.4, - * but keep checking in the future! + /* This uses private Apple API which works fine until 10.5. + * We need to keep checking in the future! * These methods are being added artificially to NSOutlineView's interface above */ o_ascendingSortingImage = [[NSOutlineView class] _defaultTableHeaderSortImage]; o_descendingSortingImage = [[NSOutlineView class] _defaultTableHeaderReverseSortImage]; o_tc_sortColumn = nil; - for( i_index = 0; i_index < p_list->i_count; i_index++ ) + char ** ppsz_name; + char ** ppsz_services = services_discovery_GetServicesNames( p_playlist, &ppsz_name ); + if( !ppsz_services ) { - vlc_bool_t b_enabled; + vlc_object_release( p_playlist ); + return; + } + + for( i = 0; ppsz_services[i]; i++ ) + { + bool 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 ? (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: - 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 @@ -447,12 +436,8 @@ [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")]; @@ -463,10 +448,8 @@ - (void)playlistUpdated { - unsigned int i; - /* Clear indications of any existing column sorting */ - for( i = 0 ; i < [[o_outline_view tableColumns] count] ; i++ ) + for( unsigned int i = 0 ; i < [[o_outline_view tableColumns] count] ; i++ ) { [o_outline_view setIndicatorImage:nil inTableColumn: [[o_outline_view tableColumns] objectAtIndex:i]]; @@ -486,7 +469,7 @@ { [o_status_field setStringValue: [NSString stringWithFormat: _NS("%i items in the playlist"), - playlist_CurrentSize( p_playlist )]]; + playlist_CurrentSize( p_playlist )]]; } else { @@ -501,22 +484,15 @@ - (void)playModeUpdated { playlist_t *p_playlist = pl_Yield( VLCIntf ); - vlc_value_t val, val2; - var_Get( p_playlist, "loop", &val2 ); - var_Get( p_playlist, "repeat", &val ); - if( val.b_bool == VLC_TRUE ) - { + bool loop = var_GetBool( p_playlist, "loop" ); + bool repeat = var_GetBool( p_playlist, "repeat" ); + if( repeat ) [[[VLCMain sharedInstance] getControls] repeatOne]; - } - else if( val2.b_bool == VLC_TRUE ) - { + else if( loop ) [[[VLCMain sharedInstance] getControls] repeatAll]; - } else - { [[[VLCMain sharedInstance] getControls] repeatOff]; - } [[[VLCMain sharedInstance] getControls] shuffle]; @@ -544,14 +520,6 @@ { [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++ ) @@ -566,12 +534,6 @@ } - 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 */ @@ -605,7 +567,7 @@ if ( p_temp_item ) { int i; - vlc_mutex_lock( &p_playlist->object_lock ); + PL_LOCK; if( b_check ) { @@ -618,7 +580,7 @@ else if ( i == p_playlist->all_items.i_size - 1 ) { vlc_object_release( p_playlist ); - vlc_mutex_unlock( &p_playlist->object_lock ); + PL_UNLOCK; return NO; } } @@ -629,12 +591,12 @@ 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; + PL_UNLOCK; + vlc_object_release( p_playlist ); + return YES; } } - vlc_mutex_unlock( &p_playlist->object_lock ); + PL_UNLOCK; } vlc_object_release( p_playlist ); @@ -671,8 +633,7 @@ - (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")]; @@ -703,8 +664,8 @@ { 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 @@ -723,7 +684,7 @@ { o_real_filename = o_filename; } - playlist_Export( p_playlist, + playlist_Export( p_playlist, [o_real_filename fileSystemRepresentation], p_playlist->p_local_category, "export-m3u" ); } @@ -761,7 +722,7 @@ p_item = NULL; } } - playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, VLC_TRUE, p_node, p_item ); + playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, true, p_node, p_item ); } vlc_object_release( p_playlist ); } @@ -773,7 +734,7 @@ 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]; @@ -797,7 +758,7 @@ } else { - msg_Dbg( p_intf, "preparse of nodes not yet implemented" ); + msg_Dbg( p_intf, "preparsing nodes not implemented" ); } } } @@ -810,13 +771,13 @@ 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]; @@ -830,48 +791,49 @@ - (IBAction)deleteItem:(id)sender { - int i, i_count, i_row; + int i_count, i_row; NSMutableArray *o_to_delete; NSNumber *o_number; playlist_t * p_playlist; intf_thread_t * p_intf = VLCIntf; - p_playlist = pl_Yield( p_intf ); - o_to_delete = [NSMutableArray arrayWithArray:[[o_outline_view selectedRowEnumerator] allObjects]]; i_count = [o_to_delete count]; - for( i = 0; i < i_count; i++ ) + p_playlist = pl_Yield( p_intf ); + + PL_LOCK; + for( int i = 0; i < i_count; i++ ) { o_number = [o_to_delete lastObject]; i_row = [o_number intValue]; id o_item = [o_outline_view itemAtRow: i_row]; playlist_item_t *p_item = [o_item pointerValue]; +#ifndef NDEBUG + msg_Dbg( p_intf, "deleting item %i (of %i) with id \"%i\", pointerValue \"%p\" and %i children", i+1, i_count, + p_item->p_input->i_id, [o_item pointerValue], p_item->i_children +1 ); +#endif [o_to_delete removeObject: o_number]; [o_outline_view deselectRow: i_row]; - if( [[o_outline_view dataSource] outlineView:o_outline_view - numberOfChildrenOfItem: o_item] > 0 ) + if( p_item->i_children != -1 ) //is a node and not an item { if( p_playlist->status.i_status != PLAYLIST_STOPPED && [self isItem: p_playlist->status.p_item inNode: ((playlist_item_t *)[o_item pointerValue]) checkItemExistence: NO] == YES ) - { // if current item is in selected node and is playing then stop playlist playlist_Stop( p_playlist ); - } - vlc_mutex_lock( &p_playlist->object_lock ); - playlist_NodeDelete( p_playlist, p_item, VLC_TRUE, VLC_FALSE ); - vlc_mutex_unlock( &p_playlist->object_lock ); + + playlist_NodeDelete( p_playlist, p_item, true, false ); } else - { - playlist_DeleteFromInput( p_playlist, p_item->p_input->i_id, VLC_FALSE ); - } + playlist_DeleteFromInput( p_playlist, p_item->p_input->i_id, true ); } + PL_UNLOCK; + [self playlistUpdated]; vlc_object_release( p_playlist ); } @@ -893,8 +855,7 @@ 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*/ @@ -904,16 +865,16 @@ if( p_item->i_children > -1 ) // the item is a node { - vlc_mutex_lock( &p_playlist->object_lock ); + PL_LOCK; playlist_RecursiveNodeSort( p_playlist, p_item, i_mode, ORDER_NORMAL ); - vlc_mutex_unlock( &p_playlist->object_lock ); + PL_UNLOCK; } else { - vlc_mutex_lock( &p_playlist->object_lock ); + PL_LOCK; playlist_RecursiveNodeSort( p_playlist, p_item->p_parent, i_mode, ORDER_NORMAL ); - vlc_mutex_unlock( &p_playlist->object_lock ); + PL_UNLOCK; } vlc_object_release( p_playlist ); [self playlistUpdated]; @@ -936,7 +897,7 @@ o_name = (NSString *)[o_one_item objectForKey: @"ITEM_NAME"]; o_options = (NSArray *)[o_one_item objectForKey: @"ITEM_OPTIONS"]; - /* Find the name for a disc entry ( i know, can you believe the trouble?) */ + /* Find the name for a disc entry (i know, can you believe the trouble?) */ if( ( !o_name || [o_name isEqualToString:@""] ) && [o_uri rangeOfString: @"/dev/"].location != NSNotFound ) { int i_count, i_index; @@ -948,14 +909,14 @@ { 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]]; } } } @@ -975,10 +936,10 @@ 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; } @@ -996,7 +957,7 @@ /* 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]; @@ -1025,22 +986,24 @@ } /* Add the item */ + /* FIXME: playlist_AddInput() can fail */ playlist_AddInput( p_playlist, p_input, PLAYLIST_INSERT, - i_position == -1 ? PLAYLIST_END : i_position + i_item, VLC_TRUE, - VLC_FALSE ); + i_position == -1 ? PLAYLIST_END : i_position + i_item, true, + false ); if( i_item == 0 && !b_enqueue ) { 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 ); + p_item = playlist_ItemGetByInput( p_playlist, p_input, true ); + playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, true, NULL, p_item ); } else { playlist_item_t *p_item; - p_item = playlist_ItemGetByInput( p_playlist, p_input, VLC_TRUE ); - playlist_Control( p_playlist, PLAYLIST_PREPARSE, VLC_TRUE, p_item ); + p_item = playlist_ItemGetByInput( p_playlist, p_input, true ); + playlist_Control( p_playlist, PLAYLIST_SKIP, true, p_item ); } + vlc_gc_decref( p_input ); } [self playlistUpdated]; vlc_object_release( p_playlist ); @@ -1065,24 +1028,26 @@ } /* Add the item */ + /* FIXME: playlist_NodeAddInput() can fail */ playlist_NodeAddInput( p_playlist, p_input, p_node, PLAYLIST_INSERT, i_position == -1 ? - PLAYLIST_END : i_position + i_item, VLC_FALSE ); + PLAYLIST_END : i_position + i_item, false ); if( i_item == 0 && !b_enqueue ) { 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 ); + p_item = playlist_ItemGetByInput( p_playlist, p_input, true ); + playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, true, NULL, p_item ); } else { playlist_item_t *p_item; - p_item = playlist_ItemGetByInput( p_playlist, p_input, VLC_TRUE ); - playlist_Control( p_playlist, PLAYLIST_PREPARSE, VLC_TRUE, p_item ); + p_item = playlist_ItemGetByInput( p_playlist, p_input, true ); + playlist_Control( p_playlist, PLAYLIST_SKIP, true, p_item ); } + vlc_gc_decref( p_input ); } [self playlistUpdated]; vlc_object_release( p_playlist ); @@ -1106,14 +1071,14 @@ char *psz_temp; NSString *o_current_name, *o_current_author; - vlc_mutex_lock( &p_playlist->object_lock ); + PL_LOCK; o_current_name = [NSString stringWithUTF8String: p_item->pp_children[i_current]->p_input->psz_name]; psz_temp = input_ItemGetInfo( p_item->p_input , _("Meta-information"),_("Artist") ); o_current_author = [NSString stringWithUTF8String: psz_temp]; free( psz_temp); - vlc_mutex_unlock( &p_playlist->object_lock ); + PL_UNLOCK; if( p_selected_item == p_item->pp_children[i_current] && b_selected_item_met == NO ) @@ -1128,9 +1093,9 @@ } else if( b_selected_item_met == YES && ( [o_current_name rangeOfString:[o_search_field - stringValue] options:NSCaseInsensitiveSearch ].length || + stringValue] options:NSCaseInsensitiveSearch].length || [o_current_author rangeOfString:[o_search_field - stringValue] options:NSCaseInsensitiveSearch ].length ) ) + stringValue] options:NSCaseInsensitiveSearch].length ) ) { vlc_object_release( p_playlist ); /*Adds the parent items in the result array as well, so that we can @@ -1222,8 +1187,8 @@ - (NSMenu *)menuForEvent:(NSEvent *)o_event { NSPoint pt; - vlc_bool_t b_rows; - vlc_bool_t b_item_sel; + bool b_rows; + bool b_item_sel; pt = [o_outline_view convertPoint: [o_event locationInWindow] fromView: nil]; @@ -1265,7 +1230,7 @@ } else { - b_isSortDescending = VLC_FALSE; + b_isSortDescending = false; } if( o_tc == o_tc_name ) @@ -1339,7 +1304,7 @@ /* 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]; } @@ -1355,17 +1320,17 @@ 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, 0 ); + if( ret_v != DIALOG_CANCELLED && psz_name && *psz_name ) + p_item = playlist_NodeCreate( p_playlist, psz_name, + p_playlist->p_local_category, 0, NULL ); else if(! config_GetInt( p_playlist, "interact" ) ) { /* in case that the interaction is disabled, just give it a bogus name */ - p_item = playlist_NodeCreate( p_playlist, _("Empty Folder"), - p_playlist->p_local_category, 0 ); + p_item = playlist_NodeCreate( p_playlist, _("Empty Folder"), + p_playlist->p_local_category, 0, NULL ); } if(! p_item ) @@ -1388,7 +1353,7 @@ { [o_status_field setStringValue: [NSString stringWithFormat: _NS("%i items in the playlist"), - playlist_CurrentSize( p_playlist )]]; + playlist_CurrentSize( p_playlist )]]; } else { @@ -1405,7 +1370,9 @@ [o_outline_dict setObject:o_value forKey:[NSString stringWithFormat:@"%p", [o_value pointerValue]]]; +#ifndef NDEBUG msg_Dbg( VLCIntf, "adding item %p", [o_value pointerValue] ); +#endif return o_value; } @@ -1428,7 +1395,10 @@ /* 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; @@ -1484,8 +1454,8 @@ /* 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; @@ -1570,8 +1540,8 @@ } } - vlc_mutex_lock( &p_playlist->object_lock ); - // Acually detach the item from the old position + PL_LOCK; + // Actually detach the item from the old position if( playlist_NodeRemoveItem( p_playlist, p_item, p_old_parent ) == VLC_SUCCESS ) { @@ -1593,7 +1563,7 @@ // Reattach the item to the new position playlist_NodeInsert( p_playlist, p_item, p_new_parent, i_new_index ); } - vlc_mutex_unlock( &p_playlist->object_lock ); + PL_UNLOCK; } [self playlistUpdated]; i_row = [o_outline_view rowForItem:[o_outline_dict @@ -1654,13 +1624,6 @@ vlc_object_release( p_playlist ); return NO; } - -/* Delegate method of NSWindow */ -/*- (void)windowWillClose:(NSNotification *)aNotification -{ - [o_btn_playlist setState: NSOffState]; -} -*/ @end