/*****************************************************************************
* 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 <jon-vl@nanocrew.net>
/* 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
#import "vlc_osd.h"
#import "misc.h"
#import <vlc_interface.h>
+#import <vlc_services_discovery.h>
/*****************************************************************************
- * VLCPlaylistView implementation
+ * VLCPlaylistView implementation
*****************************************************************************/
@implementation VLCPlaylistView
case NSEnterCharacter:
case NSCarriageReturnCharacter:
- [(VLCPlaylist *)[[VLCMain sharedInstance] getPlaylist]
- playItem:self];
+ [(VLCPlaylist *)[[VLCMain sharedInstance] playlist] playItem:self];
break;
default:
@end
-
/*****************************************************************************
* VLCPlaylistCommon implementation
*
}
- (void)awakeFromNib
{
- playlist_t * p_playlist = pl_Yield( VLCIntf );
+ playlist_t * p_playlist = pl_Hold( VLCIntf );
[o_outline_view setTarget: self];
[o_outline_view setDelegate: self];
[o_outline_view setDataSource: self];
+ [o_outline_view setAllowsEmptySelection: NO];
+ [o_outline_view expandItem: [o_outline_view itemAtRow:0]];
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
[self initStrings];
}
@implementation VLCPlaylistCommon (NSOutlineViewDataSource)
/* return the number of children for Obj-C pointer item */ /* DONE */
-- (int)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item
+- (NSInteger)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item
{
int i_return = 0;
playlist_item_t *p_item = NULL;
- playlist_t * p_playlist = pl_Yield( VLCIntf );
- if( outlineView != o_outline_view )
- {
- vlc_object_release( p_playlist );
- return 0;
- }
+ playlist_t * p_playlist = pl_Hold( VLCIntf );
+ assert( 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 */
-- (id)outlineView:(NSOutlineView *)outlineView child:(int)index ofItem:(id)item
+- (id)outlineView:(NSOutlineView *)outlineView child:(NSInteger)index ofItem:(id)item
{
playlist_item_t *p_return = NULL, *p_item = NULL;
NSValue *o_value;
- playlist_t * p_playlist = pl_Yield( VLCIntf );
+ playlist_t * p_playlist = pl_Hold( VLCIntf );
+ PL_LOCK;
if( item == nil )
{
/* root object */
}
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 );
+ PL_UNLOCK;
+
+ pl_Release( VLCIntf );
o_value = [o_outline_dict objectForKey:[NSString stringWithFormat: @"%p", p_return]];
if( o_value == nil )
{
+ /* Why is there a warning if that happens all the time and seems
+ * to be normal? Add an assert and fix it.
+ * msg_Warn( VLCIntf, "playlist item misses pointer value, adding one" ); */
o_value = [[NSValue valueWithPointer: p_return] retain];
- msg_Err( VLCIntf, "missing playlist item's pointer value" );
}
return o_value;
}
- (BOOL)outlineView:(NSOutlineView *)outlineView isItemExpandable:(id)item
{
int i_return = 0;
- playlist_t *p_playlist = pl_Yield( VLCIntf );
+ playlist_t *p_playlist = pl_Hold( VLCIntf );
if( item == nil )
{
if( p_item )
i_return = p_item->i_children;
}
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
- return (i_return > 0);
+ return (i_return >= 0);
}
/* retrieve the string values for the cells */
}
return @"error" ;
}
-
+
p_item = (playlist_item_t *)[item pointerValue];
if( !p_item || !p_item->p_input )
{
}
return @"error";
}
-
+
attempted_reload = NO;
- if( [[o_tc identifier] isEqualToString:@"1"] )
+ if( [[o_tc identifier] isEqualToString:@"name"] )
{
/* sanity check to prevent the NSString class from crashing */
char *psz_title = input_item_GetTitle( p_item->p_input );
if( !EMPTY_STR( psz_title ) )
{
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 )
- {
+ if( psz_name )
o_value = [NSString stringWithUTF8String: psz_name];
- if( o_value == NULL )
- o_value = [NSString stringWithCString: psz_name];
- }
free( psz_name );
}
free( psz_title );
}
- else
+ else if( [[o_tc identifier] isEqualToString:@"artist"] )
{
char *psz_artist = input_item_GetArtist( p_item->p_input );
- if( [[o_tc identifier] isEqualToString:@"2"] && !EMPTY_STR( psz_artist ) )
- {
+ if( psz_artist )
o_value = [NSString stringWithUTF8String: psz_artist];
- if( o_value == NULL )
- o_value = [NSString stringWithCString: psz_artist];
+ free( psz_artist );
+ }
+ else if( [[o_tc identifier] isEqualToString:@"duration"] )
+ {
+ char psz_duration[MSTRTIME_MAX_SIZE];
+ mtime_t dur = input_item_GetDuration( p_item->p_input );
+ if( dur != -1 )
+ {
+ secstotimestr( psz_duration, dur/1000000 );
+ o_value = [NSString stringWithUTF8String: psz_duration];
}
- else if( [[o_tc identifier] isEqualToString:@"3"] )
+ else
+ o_value = @"--:--";
+ }
+ else if( [[o_tc identifier] isEqualToString:@"status"] )
+ {
+ if( input_item_HasErrorWhenReading( p_item->p_input ) )
{
- char psz_duration[MSTRTIME_MAX_SIZE];
- mtime_t dur = p_item->p_input->i_duration;
- if( dur != -1 )
- {
- secstotimestr( psz_duration, dur/1000000 );
- o_value = [NSString stringWithUTF8String: psz_duration];
- }
- else
- {
- o_value = @"-:--:--";
- }
+ o_value = [NSImage imageWithWarningIcon];
}
- free( psz_artist );
}
-
- return( o_value );
+ return o_value;
}
@end
return self;
}
+- (void)dealloc
+{
+ [o_nodes_array release];
+ [o_items_array release];
+ [super dealloc];
+}
+
- (void)awakeFromNib
{
- playlist_t * p_playlist = pl_Yield( VLCIntf );
- vlc_list_t *p_list = vlc_list_find( p_playlist, VLC_OBJECT_MODULE,
- FIND_ANYWHERE );
+ playlist_t * p_playlist = pl_Hold( VLCIntf );
- int i_index;
+ int i;
[super awakeFromNib];
@"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 = vlc_sd_GetNames( &ppsz_name );
+ if( !ppsz_services )
{
- 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 ? (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];
- }
+ pl_Release( VLCIntf );
+ return;
}
- vlc_list_release( p_list );
- vlc_object_release( p_playlist );
+
+ for( i = 0; ppsz_services[i]; i++ )
+ {
+ bool b_enabled;
+ NSMenuItem *o_lmi;
- //[self playlistUpdated];
+ char * name = ppsz_name[i] ? ppsz_name[i] : ppsz_services[i];
+ /* Check whether to enable these menuitems */
+ b_enabled = playlist_IsServicesDiscoveryLoaded( p_playlist, ppsz_services[i] );
+
+ /* 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 );
+
+ pl_Release( VLCIntf );
}
- (void)searchfieldChanged:(NSNotification *)o_notification
[o_mi_delete setTitle: _NS("Delete")];
[o_mi_recursive_expand setTitle: _NS("Expand Node")];
[o_mi_selectall setTitle: _NS("Select All")];
- [o_mi_info setTitle: _NS("Information")];
- [o_mi_preparse setTitle: _NS("Get Stream Information")];
+ [o_mi_info setTitle: _NS("Media Information...")];
+ [o_mi_dl_cover_art setTitle: _NS("Download Cover Art")];
+ [o_mi_preparse setTitle: _NS("Fetch Meta Data")];
+ [o_mi_revealInFinder setTitle: _NS("Reveal in Finder")];
+ [o_mm_mi_revealInFinder setTitle: _NS("Reveal in Finder")];
+ [[o_mm_mi_revealInFinder menu] setAutoenablesItems: NO];
[o_mi_sort_name setTitle: _NS("Sort Node by Name")];
[o_mi_sort_author setTitle: _NS("Sort Node by Author")];
[o_mi_services setTitle: _NS("Services discovery")];
- [o_status_field setStringValue: [NSString stringWithFormat:
- _NS("No items in the playlist")]];
+ [o_mm_mi_services setTitle: _NS("Services discovery")];
+ [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")];
- (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]];
// 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];
+ [[[[VLCMain sharedInstance] wizard] playlistWizard] reloadOutlineView];
+ [[[[VLCMain sharedInstance] bookmarks] dataTable] reloadData];
- playlist_t *p_playlist = pl_Yield( VLCIntf );
+ playlist_t *p_playlist = pl_Hold( VLCIntf );
+ PL_LOCK;
if( playlist_CurrentSize( p_playlist ) >= 2 )
{
[o_status_field setStringValue: [NSString stringWithFormat:
- _NS("%i items in the playlist"),
- playlist_CurrentSize( p_playlist )]];
+ _NS("%i items"),
+ 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")];
+ [o_status_field setStringValue: _NS("1 item")];
}
- vlc_object_release( p_playlist );
+ PL_UNLOCK;
+ pl_Release( VLCIntf );
+
+ [self outlineViewSelectionDidChange: nil];
}
- (void)playModeUpdated
{
- playlist_t *p_playlist = pl_Yield( VLCIntf );
- vlc_value_t val, val2;
-
- var_Get( p_playlist, "loop", &val2 );
- var_Get( p_playlist, "repeat", &val );
- if( val.b_bool == VLC_TRUE )
- {
- [[[VLCMain sharedInstance] getControls] repeatOne];
- }
- else if( val2.b_bool == VLC_TRUE )
- {
- [[[VLCMain sharedInstance] getControls] repeatAll];
- }
+ playlist_t *p_playlist = pl_Hold( VLCIntf );
+
+ bool loop = var_GetBool( p_playlist, "loop" );
+ bool repeat = var_GetBool( p_playlist, "repeat" );
+ if( repeat )
+ [[[VLCMain sharedInstance] controls] repeatOne];
+ else if( loop )
+ [[[VLCMain sharedInstance] controls] repeatAll];
else
+ [[[VLCMain sharedInstance] controls] repeatOff];
+
+ [[[VLCMain sharedInstance] controls] shuffle];
+
+ pl_Release( VLCIntf );
+}
+
+- (void)outlineViewSelectionDidChange:(NSNotification *)notification
+{
+ // FIXME: unsafe
+ playlist_item_t * p_item = [[o_outline_view itemAtRow:[o_outline_view selectedRow]] pointerValue];
+
+ if( p_item )
{
- [[[VLCMain sharedInstance] getControls] repeatOff];
- }
+ /* update the state of our Reveal-in-Finder menu items */
+ NSMutableString *o_mrl;
+ char *psz_uri = input_item_GetURI( p_item->p_input );
+ if( psz_uri )
+ {
+ o_mrl = [NSMutableString stringWithUTF8String: psz_uri];
+
+ /* perform some checks whether it is a file and if it is local at all... */
+ NSRange prefix_range = [o_mrl rangeOfString: @"file:"];
+ if( prefix_range.location != NSNotFound )
+ [o_mrl deleteCharactersInRange: prefix_range];
+
+ if( [o_mrl characterAtIndex:0] == '/' )
+ {
+ [o_mi_revealInFinder setEnabled: YES];
+ [o_mm_mi_revealInFinder setEnabled: YES];
+ return;
+ }
+ }
+ [o_mi_revealInFinder setEnabled: NO];
+ [o_mm_mi_revealInFinder setEnabled: NO];
- [[[VLCMain sharedInstance] getControls] shuffle];
+ if( [[VLCMain sharedInstance] isPlaylistCollapsed] == NO )
+ {
+ /* update our info-panel to reflect the new item, if we aren't collapsed */
+ [[[VLCMain sharedInstance] info] updatePanelWithItem:p_item->p_input];
+ }
+ }
+}
- vlc_object_release( p_playlist );
+- (BOOL)isSelectionEmpty
+{
+ return [o_outline_view selectedRow] == -1;
}
- (void)updateRowSelection
int i_row;
unsigned int j;
- playlist_t *p_playlist = pl_Yield( VLCIntf );
+ // FIXME: unsafe
+ playlist_t *p_playlist = pl_Hold( VLCIntf );
playlist_item_t *p_item, *p_temp_item;
NSMutableArray *o_array = [NSMutableArray array];
- p_item = p_playlist->status.p_item;
+ PL_LOCK;
+ p_item = playlist_CurrentPlayingItem( p_playlist );
if( p_item == NULL )
{
- vlc_object_release(p_playlist);
+ PL_UNLOCK;
+ pl_Release( VLCIntf );
return;
}
{
[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++ )
}
- 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 */
- [[[VLCMain sharedInstance] getInfo] updatePanel];
+ PL_UNLOCK;
+ pl_Release( VLCIntf );
}
/* Check if p_item is a child of p_node recursively. We need to check the item
existence first since OSX sometimes tries to redraw items that have been
- deleted. We don't do it when not required since this verification takes
+ deleted. We don't do it when not required since this verification takes
quite a long time on big playlists (yes, pretty hacky). */
+
- (BOOL)isItem: (playlist_item_t *)p_item
inNode: (playlist_item_t *)p_node
checkItemExistence:(BOOL)b_check
+ locked:(BOOL)b_locked
{
- playlist_t * p_playlist = pl_Yield( VLCIntf );
+ playlist_t * p_playlist = pl_Hold( VLCIntf );
playlist_item_t *p_temp_item = p_item;
if( p_node == p_item )
{
- vlc_object_release(p_playlist);
+ pl_Release( VLCIntf );
return YES;
}
if( p_node->i_children < 1)
{
- vlc_object_release(p_playlist);
+ pl_Release( VLCIntf );
return NO;
}
if ( p_temp_item )
{
int i;
- vlc_mutex_lock( &p_playlist->object_lock );
+ if(!b_locked) PL_LOCK;
if( b_check )
{
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 );
+ if(!b_locked) PL_UNLOCK;
+ pl_Release( VLCIntf );
return NO;
}
}
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;
+ if(!b_locked) PL_UNLOCK;
+ pl_Release( VLCIntf );
+ return YES;
}
}
- vlc_mutex_unlock( &p_playlist->object_lock );
+ if(!b_locked) PL_UNLOCK;
}
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
return NO;
}
+- (BOOL)isItem: (playlist_item_t *)p_item
+ inNode: (playlist_item_t *)p_node
+ checkItemExistence:(BOOL)b_check
+{
+ [self isItem:p_item inNode:p_node checkItemExistence:b_check locked:NO];
+}
+
/* This method is usefull for instance to remove the selected children of an
already selected node */
- (void)removeItemsFrom:(id)o_items ifChildrenOf:(id)o_nodes
}
if( [self isItem: [[o_items objectAtIndex:i] pointerValue]
inNode: [[o_nodes objectAtIndex:j] pointerValue]
- checkItemExistence: NO] )
+ checkItemExistence: NO locked:NO] )
{
[o_items removeObjectAtIndex:i];
/* We need to execute the next iteration with the same index
}
}
}
-
}
- (IBAction)savePlaylist:(id)sender
{
- intf_thread_t * p_intf = VLCIntf;
- playlist_t * p_playlist = pl_Yield( p_intf );
+ playlist_t * p_playlist = pl_Hold( VLCIntf );
NSSavePanel *o_save_panel = [NSSavePanel savePanel];
NSString * o_name = [NSString stringWithFormat: @"%@", _NS("Untitled")];
{
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
{
o_real_filename = o_filename;
}
- playlist_Export( p_playlist,
+ playlist_Export( p_playlist,
[o_real_filename fileSystemRepresentation],
p_playlist->p_local_category, "export-m3u" );
}
}
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
}
/* When called retrieves the selected outlineview row and plays that node or item */
- (IBAction)playItem:(id)sender
{
intf_thread_t * p_intf = VLCIntf;
- playlist_t * p_playlist = pl_Yield( p_intf );
+ playlist_t * p_playlist = pl_Hold( p_intf );
playlist_item_t *p_item;
playlist_item_t *p_node = NULL;
p_item = NULL;
}
}
- playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, VLC_TRUE, p_node, p_item );
+ playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, pl_Unlocked, p_node, p_item );
}
- vlc_object_release( p_playlist );
+ pl_Release( p_intf );
}
+- (IBAction)revealItemInFinder:(id)sender
+{
+ playlist_item_t * p_item = [[o_outline_view itemAtRow:[o_outline_view selectedRow]] pointerValue];
+ NSMutableString * o_mrl = nil;
+
+ if(! p_item || !p_item->p_input )
+ return;
+
+ char *psz_uri = input_item_GetURI( p_item->p_input );
+ if( psz_uri )
+ o_mrl = [NSMutableString stringWithUTF8String: psz_uri];
+
+ /* perform some checks whether it is a file and if it is local at all... */
+ NSRange prefix_range = [o_mrl rangeOfString: @"file:"];
+ if( prefix_range.location != NSNotFound )
+ [o_mrl deleteCharactersInRange: prefix_range];
+
+ if( [o_mrl characterAtIndex:0] == '/' )
+ [[NSWorkspace sharedWorkspace] selectFile: o_mrl inFileViewerRootedAtPath: o_mrl];
+}
+
/* When called retrieves the selected outlineview row and plays that node or item */
- (IBAction)preparseItem:(id)sender
{
int i_count;
NSMutableArray *o_to_preparse;
intf_thread_t * p_intf = VLCIntf;
- playlist_t * p_playlist = pl_Yield( p_intf );
-
+ playlist_t * p_playlist = pl_Hold( p_intf );
+
o_to_preparse = [NSMutableArray arrayWithArray:[[o_outline_view selectedRowEnumerator] allObjects]];
i_count = [o_to_preparse count];
{
if( p_item->i_children == -1 )
{
- playlist_PreparseEnqueue( p_playlist, p_item->p_input );
+ playlist_PreparseEnqueue( p_playlist, p_item->p_input, pl_Unlocked );
}
else
{
- msg_Dbg( p_intf, "preparse of nodes not yet implemented" );
+ msg_Dbg( p_intf, "preparsing nodes not implemented" );
}
}
}
- vlc_object_release( p_playlist );
+ pl_Release( p_intf );
+ [self playlistUpdated];
+}
+
+- (IBAction)downloadCoverArt:(id)sender
+{
+ int i_count;
+ NSMutableArray *o_to_preparse;
+ intf_thread_t * p_intf = VLCIntf;
+ playlist_t * p_playlist = pl_Hold( p_intf );
+
+ o_to_preparse = [NSMutableArray arrayWithArray:[[o_outline_view selectedRowEnumerator] allObjects]];
+ i_count = [o_to_preparse count];
+
+ int i, i_row;
+ NSNumber *o_number;
+ playlist_item_t *p_item = NULL;
+
+ for( i = 0; i < i_count; i++ )
+ {
+ o_number = [o_to_preparse lastObject];
+ i_row = [o_number intValue];
+ p_item = [[o_outline_view itemAtRow:i_row] pointerValue];
+ [o_to_preparse removeObject: o_number];
+ [o_outline_view deselectRow: i_row];
+
+ if( p_item && p_item->i_children == -1 )
+ {
+ playlist_AskForArtEnqueue( p_playlist, p_item->p_input, pl_Unlocked );
+ }
+ }
+ pl_Release( p_intf );
[self playlistUpdated];
}
{
NSMenuItem *o_mi = (NSMenuItem *)sender;
NSString *o_string = [o_mi representedObject];
- playlist_t * p_playlist = pl_Yield( VLCIntf );
+ playlist_t * p_playlist = pl_Hold( VLCIntf );
if( !playlist_IsServicesDiscoveryLoaded( p_playlist, [o_string UTF8String] ) )
playlist_ServicesDiscoveryAdd( p_playlist, [o_string UTF8String] );
else
[o_mi setState: playlist_IsServicesDiscoveryLoaded( p_playlist,
[o_string UTF8String] ) ? YES : NO];
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
[self playlistUpdated];
return;
}
- (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_Hold( 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:
+ if( playlist_Status( p_playlist ) != PLAYLIST_STOPPED &&
+ [self isItem: playlist_CurrentPlayingItem( p_playlist ) inNode:
((playlist_item_t *)[o_item pointerValue])
- checkItemExistence: NO] == YES )
- {
+ checkItemExistence: NO locked:YES] == YES )
// if current item is in selected node and is playing then stop playlist
- playlist_Stop( p_playlist );
- }
- 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_Control(p_playlist, PLAYLIST_STOP, pl_Locked );
+
+ playlist_NodeDelete( p_playlist, p_item, true, false );
}
else
- {
- playlist_DeleteFromInput( p_playlist, p_item->p_input->i_id, VLC_FALSE );
- }
+ playlist_DeleteFromInput( p_playlist, p_item->p_input->i_id, pl_Locked );
}
+ PL_UNLOCK;
+
[self playlistUpdated];
- vlc_object_release( p_playlist );
+ pl_Release( p_intf );
}
- (IBAction)sortNodeByName:(id)sender
- (void)sortNode:(int)i_mode
{
- playlist_t * p_playlist = pl_Yield( VLCIntf );
+ playlist_t * p_playlist = pl_Hold( VLCIntf );
playlist_item_t * p_item;
if( [o_outline_view selectedRow] > -1 )
{
- 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*/
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 );
+ pl_Release( VLCIntf );
[self playlistUpdated];
}
- (input_item_t *)createItem:(NSDictionary *)o_one_item
{
intf_thread_t * p_intf = VLCIntf;
- playlist_t * p_playlist = pl_Yield( p_intf );
+ playlist_t * p_playlist = pl_Hold( p_intf );
input_item_t *p_input;
int i;
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;
{
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]];
}
}
}
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;
}
- p_input = input_ItemNew( p_playlist, [o_uri fileSystemRepresentation], [o_name UTF8String] );
+ p_input = input_item_New( p_playlist, [o_uri fileSystemRepresentation], [o_name UTF8String] );
if( !p_input )
- return NULL;
+ {
+ pl_Release( p_intf );
+ return NULL;
+ }
if( o_options )
{
for( i = 0; i < (int)[o_options count]; i++ )
{
- input_ItemAddOption( p_input, strdup( [[o_options objectAtIndex:i] UTF8String] ) );
+ input_item_AddOption( p_input, strdup( [[o_options objectAtIndex:i] UTF8String] ),
+ VLC_INPUT_OPTION_TRUSTED );
}
}
/* 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];
}
- vlc_object_release( p_playlist );
+ pl_Release( p_intf );
return p_input;
}
- (void)appendArray:(NSArray*)o_array atPos:(int)i_position enqueue:(BOOL)b_enqueue
{
int i_item;
- playlist_t * p_playlist = pl_Yield( VLCIntf );
+ playlist_t * p_playlist = pl_Hold( VLCIntf );
+ PL_LOCK;
for( i_item = 0; i_item < (int)[o_array count]; i_item++ )
{
input_item_t *p_input;
}
/* 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,
+ pl_Locked );
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, 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 );
+ playlist_item_t *p_item = NULL;
+ playlist_item_t *p_node = NULL;
+ p_item = playlist_ItemGetByInput( p_playlist, p_input );
+ if( p_item )
+ {
+ if( p_item->i_children == -1 )
+ p_node = p_item->p_parent;
+ else
+ {
+ p_node = p_item;
+ if( p_node->i_children > 0 && p_node->pp_children[0]->i_children == -1 )
+ p_item = p_node->pp_children[0];
+ else
+ p_item = NULL;
+ }
+ playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, pl_Locked, p_node, p_item );
+ }
}
+ vlc_gc_decref( p_input );
}
+ PL_UNLOCK;
+
[self playlistUpdated];
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
}
- (void)appendNodeArray:(NSArray*)o_array inNode:(playlist_item_t *)p_node atPos:(int)i_position enqueue:(BOOL)b_enqueue
{
int i_item;
- playlist_t * p_playlist = pl_Yield( VLCIntf );
+ playlist_t * p_playlist = pl_Hold( VLCIntf );
for( i_item = 0; i_item < (int)[o_array count]; i_item++ )
{
/* Get the item */
o_one_item = [o_array objectAtIndex: i_item];
p_input = [self createItem: o_one_item];
- if( !p_input )
- {
- continue;
- }
+
+ if( !p_input ) continue;
/* Add the item */
- playlist_NodeAddInput( p_playlist, p_input, p_node,
+ /* FIXME: playlist_BothAddInput() can fail */
+ PL_LOCK;
+ playlist_BothAddInput( p_playlist, p_input, p_node,
PLAYLIST_INSERT,
i_position == -1 ?
- PLAYLIST_END : i_position + i_item, VLC_FALSE );
+ PLAYLIST_END : i_position + i_item,
+ NULL, NULL, pl_Locked );
if( i_item == 0 && !b_enqueue )
{
playlist_item_t *p_item;
- p_item = playlist_ItemGetByInput( p_playlist, p_input, VLC_TRUE );
- playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, VLC_TRUE, 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 );
+ p_item = playlist_ItemGetByInput( p_playlist, p_input );
+ playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, pl_Locked, p_node, p_item );
}
+ PL_UNLOCK;
+ vlc_gc_decref( p_input );
}
[self playlistUpdated];
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
}
- (NSMutableArray *)subSearchItem:(playlist_item_t *)p_item
{
- playlist_t *p_playlist = pl_Yield( VLCIntf );
+ playlist_t *p_playlist = pl_Hold( VLCIntf );
playlist_item_t *p_selected_item;
int i_current, i_selected_row;
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 ,
+ psz_temp = input_item_GetInfo( 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 )
else if( p_selected_item == p_item->pp_children[i_current] &&
b_selected_item_met == YES )
{
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
return NULL;
}
else if( b_selected_item_met == YES &&
( [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 );
+ pl_Release( VLCIntf );
/*Adds the parent items in the result array as well, so that we can
expand the tree*/
return [NSMutableArray arrayWithObject: [NSValue
p_item->pp_children[i_current]];
if( o_result != NULL )
{
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
[o_result insertObject: [NSValue valueWithPointer:
p_item->pp_children[i_current]] atIndex:0];
return o_result;
}
}
}
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
return NULL;
}
- (IBAction)searchItem:(id)sender
{
- playlist_t * p_playlist = pl_Yield( VLCIntf );
+ playlist_t * p_playlist = pl_Hold( VLCIntf );
id o_result;
unsigned int i;
[o_outline_view selectRow:i_row byExtendingSelection: NO];
[o_outline_view scrollRowToVisible: i_row];
}
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
}
- (IBAction)recursiveExpandNode:(id)sender
- (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];
- b_item_sel = ( [o_outline_view rowAtPoint: pt] != -1 &&
- [o_outline_view selectedRow] != -1 );
+ int row = [o_outline_view rowAtPoint:pt];
+ if( row != -1 )
+ [o_outline_view selectRowIndexes:[NSIndexSet indexSetWithIndex:row] byExtendingSelection:NO];
+
+ b_item_sel = ( row != -1 && [o_outline_view selectedRow] != -1 );
b_rows = [o_outline_view numberOfRows] != 0;
[o_mi_play setEnabled: b_item_sel];
return( o_ctx_menu );
}
-- (void)outlineView: (NSTableView*)o_tv
+- (void)outlineView: (NSOutlineView *)o_tv
didClickTableColumn:(NSTableColumn *)o_tc
{
- int i_mode = 0, i_type;
+ int i_mode, i_type = 0;
intf_thread_t *p_intf = VLCIntf;
- playlist_t *p_playlist = pl_Yield( p_intf );
+ playlist_t *p_playlist = pl_Hold( p_intf );
/* Check whether the selected table column header corresponds to a
sortable table column*/
if( !( o_tc == o_tc_name || o_tc == o_tc_author ) )
{
- vlc_object_release( p_playlist );
+ pl_Release( p_intf );
return;
}
}
else
{
- b_isSortDescending = VLC_FALSE;
+ b_isSortDescending = false;
}
if( o_tc == o_tc_name )
i_type = ORDER_NORMAL;
}
- vlc_mutex_lock( &p_playlist->object_lock );
+ PL_LOCK;
playlist_RecursiveNodeSort( p_playlist, p_playlist->p_root_category, i_mode, i_type );
- vlc_mutex_unlock( &p_playlist->object_lock );
+ PL_UNLOCK;
- vlc_object_release( p_playlist );
+ pl_Release( p_intf );
[self playlistUpdated];
o_tc_sortColumn = o_tc;
forTableColumn:(NSTableColumn *)tableColumn
item:(id)item
{
- playlist_t *p_playlist = pl_Yield( VLCIntf );
+ playlist_t *p_playlist = pl_Hold( VLCIntf );
id o_playing_item;
+ PL_LOCK;
o_playing_item = [o_outline_dict objectForKey:
- [NSString stringWithFormat:@"%p", p_playlist->status.p_item]];
+ [NSString stringWithFormat:@"%p", playlist_CurrentPlayingItem( p_playlist )]];
+ PL_UNLOCK;
if( [self isItem: [o_playing_item pointerValue] inNode:
[item pointerValue] checkItemExistence: YES]
|| [o_playing_item isEqual: item] )
{
- [cell setFont: [NSFont boldSystemFontOfSize: 0]];
+ [cell setFont: [[NSFontManager sharedFontManager] convertFont:[cell font] toHaveTrait:NSBoldFontMask]];
}
else
{
- [cell setFont: [NSFont systemFontOfSize: 0]];
+ [cell setFont: [[NSFontManager sharedFontManager] convertFont:[cell font] toNotHaveTrait:NSBoldFontMask]];
}
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
}
- (IBAction)addNode:(id)sender
{
- /* 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];
-}
-
-- (void)addNodeThreadedly
-{
- NSAutoreleasePool * ourPool = [[NSAutoreleasePool alloc] init];
-
- /* simply adds a new node to the end of the playlist */
- playlist_t * p_playlist = pl_Yield( VLCIntf );
+ playlist_t * p_playlist = pl_Hold( VLCIntf );
vlc_thread_set_priority( p_playlist, VLC_THREAD_PRIORITY_LOW );
- int ret_v;
- char *psz_name = NULL;
- playlist_item_t * p_item;
- ret_v = intf_UserStringInput( p_playlist, _("New Node"),
- _("Please enter a name for the new node."), &psz_name );
-
- if( psz_name != NULL && psz_name != "" )
- p_item = playlist_NodeCreate( p_playlist, psz_name,
- p_playlist->p_local_category, 0 );
- 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 );
- }
+ PL_LOCK;
+ playlist_NodeCreate( p_playlist, _("Empty Folder"),
+ p_playlist->p_local_category, 0, NULL );
+ PL_UNLOCK;
- if(! p_item )
- msg_Warn( VLCIntf, "node creation failed or cancelled by user" );
+ pl_Release( VLCIntf );
- vlc_object_release( p_playlist );
- [ourPool release];
+ [self playlistUpdated];
}
-
@end
@implementation VLCPlaylist (NSOutlineViewDataSource)
-- (id)outlineView:(NSOutlineView *)outlineView child:(int)index ofItem:(id)item
+- (id)outlineView:(NSOutlineView *)outlineView child:(NSInteger)index ofItem:(id)item
{
id o_value = [super outlineView: outlineView child: index ofItem: item];
- playlist_t *p_playlist = pl_Yield( VLCIntf );
+ playlist_t *p_playlist = pl_Hold( VLCIntf );
+ PL_LOCK;
if( playlist_CurrentSize( p_playlist ) >= 2 )
{
[o_status_field setStringValue: [NSString stringWithFormat:
- _NS("%i items in the playlist"),
- playlist_CurrentSize( p_playlist )]];
+ _NS("%i items"),
+ playlist_CurrentSize( p_playlist )]];
}
else
{
}
else
{
- [o_status_field setStringValue: _NS("1 item in the playlist")];
+ [o_status_field setStringValue: _NS("1 item")];
}
}
- vlc_object_release( p_playlist );
+ PL_UNLOCK;
+
+ pl_Release( VLCIntf );
[o_outline_dict setObject:o_value forKey:[NSString stringWithFormat:@"%p",
[o_value pointerValue]]];
- msg_Dbg( VLCIntf, "adding item %p", [o_value pointerValue] );
return o_value;
}
- (BOOL)outlineView:(NSOutlineView *)outlineView writeItems:(NSArray *)items toPasteboard:(NSPasteboard *)pboard
{
unsigned int i;
- playlist_t *p_playlist = pl_Yield( VLCIntf );
+ playlist_t *p_playlist = pl_Hold( VLCIntf );
/* First remove the items that were moved during the last drag & drop
operation */
/* 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] ||
+ [o_item pointerValue] == p_playlist->p_local_category ||
+ [o_item pointerValue] == p_playlist->p_ml_category )
{
- vlc_object_release(p_playlist);
+ pl_Release( VLCIntf );
return NO;
}
/* Fill the items and nodes to move in 2 different arrays */
@"VLCPlaylistItemPboardType", nil] owner: self];
[pboard setData:[NSData data] forType:@"VLCPlaylistItemPboardType"];
- vlc_object_release(p_playlist);
+ pl_Release( VLCIntf );
return YES;
}
-- (NSDragOperation)outlineView:(NSOutlineView *)outlineView validateDrop:(id <NSDraggingInfo>)info proposedItem:(id)item proposedChildIndex:(int)index
+- (NSDragOperation)outlineView:(NSOutlineView *)outlineView validateDrop:(id <NSDraggingInfo>)info proposedItem:(id)item proposedChildIndex:(NSInteger)index
{
- playlist_t *p_playlist = pl_Yield( VLCIntf );
+ playlist_t *p_playlist = pl_Hold( VLCIntf );
NSPasteboard *o_pasteboard = [info draggingPasteboard];
if( !p_playlist ) return NSDragOperationNone;
if( index == NSOutlineViewDropOnItemIndex &&
((playlist_item_t *)[item pointerValue])->i_children == -1 )
{
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
return NSDragOperationNone;
}
}
/* Don't allow on drop on playlist root element's child */
if( !item && index != NSOutlineViewDropOnItemIndex)
{
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
return NSDragOperationNone;
}
/* 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 );
+ pl_Release( VLCIntf );
return NSDragOperationNone;
}
[[o_nodes_array objectAtIndex: i] pointerValue]
checkItemExistence: NO] )
{
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
return NSDragOperationNone;
}
}
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
return NSDragOperationMove;
}
/* Drop from the Finder */
else if( [[o_pasteboard types] containsObject: NSFilenamesPboardType] )
{
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
return NSDragOperationGeneric;
}
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
return NSDragOperationNone;
}
-- (BOOL)outlineView:(NSOutlineView *)outlineView acceptDrop:(id <NSDraggingInfo>)info item:(id)item childIndex:(int)index
+- (BOOL)outlineView:(NSOutlineView *)outlineView acceptDrop:(id <NSDraggingInfo>)info item:(id)item childIndex:(NSInteger)index
{
- playlist_t * p_playlist = pl_Yield( VLCIntf );
+ playlist_t * p_playlist = pl_Hold( VLCIntf );
NSPasteboard *o_pasteboard = [info draggingPasteboard];
/* Drag & Drop inside the playlist */
(This should never be true) */
if( p_new_parent->i_children < 0 )
{
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
return NO;
}
}
}
- 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 )
{
// 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
[o_outline_view selectRow: i_row byExtendingSelection: NO];
[o_outline_view scrollRowToVisible: i_row];
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
return YES;
}
if ( item == nil )
{
- [self appendArray: o_array atPos: index enqueue: YES];
- }
- /* This should never occur */
- else if( p_node->i_children == -1 )
- {
- vlc_object_release( p_playlist );
- return NO;
+ [self appendArray:o_array atPos:index enqueue: YES];
}
else
{
- [self appendNodeArray: o_array inNode: p_node
- atPos: index enqueue: YES];
+ assert( p_node->i_children != -1 );
+ [self appendNodeArray:o_array inNode: p_node
+ atPos:index enqueue:YES];
}
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
return YES;
}
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
return NO;
}
-
-/* Delegate method of NSWindow */
-/*- (void)windowWillClose:(NSNotification *)aNotification
-{
- [o_btn_playlist setState: NSOffState];
-}
-*/
@end
projects / vlc / blobdiff