#import "vlc_osd.h"
#import "misc.h"
#import <vlc_interface.h>
+#import <vlc_services_discovery.h>
/*****************************************************************************
* VLCPlaylistView implementation
case NSEnterCharacter:
case NSCarriageReturnCharacter:
- [(VLCPlaylist *)[[VLCMain sharedInstance] getPlaylist] playItem:self];
+ [(VLCPlaylist *)[[VLCMain sharedInstance] playlist] playItem:self];
break;
default:
}
- (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 );
+ playlist_t * p_playlist = pl_Hold( VLCIntf );
assert( outlineView == o_outline_view );
if( !item )
}
/* 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 )
p_return = p_item->pp_children[index];
PL_UNLOCK;
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
o_value = [o_outline_dict objectForKey:[NSString stringWithFormat: @"%p", p_return]];
- (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 )
{
- (void)awakeFromNib
{
- playlist_t * p_playlist = pl_Yield( VLCIntf );
+ playlist_t * p_playlist = pl_Hold( VLCIntf );
int i;
o_tc_sortColumn = nil;
char ** ppsz_name;
- char ** ppsz_services = services_discovery_GetServicesNames( p_playlist, &ppsz_name );
+ char ** ppsz_services = vlc_sd_GetNames( &ppsz_name );
if( !ppsz_services )
{
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
return;
}
free( ppsz_services );
free( ppsz_name );
- vlc_object_release( p_playlist );
+ 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_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")];
// 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:
else
[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 );
+ 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] getControls] repeatOne];
+ [[[VLCMain sharedInstance] controls] repeatOne];
else if( loop )
- [[[VLCMain sharedInstance] getControls] repeatAll];
+ [[[VLCMain sharedInstance] controls] repeatAll];
else
- [[[VLCMain sharedInstance] getControls] repeatOff];
+ [[[VLCMain sharedInstance] controls] repeatOff];
- [[[VLCMain sharedInstance] getControls] shuffle];
+ [[[VLCMain sharedInstance] controls] shuffle];
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
}
- (void)outlineViewSelectionDidChange:(NSNotification *)notification
if( p_item )
{
- /* update our info-panel to reflect the new item */
- [[[VLCMain sharedInstance] getInfo] updatePanelWithItem:p_item->p_input];
-
/* update the state of our Reveal-in-Finder menu items */
NSMutableString *o_mrl;
char *psz_uri = input_item_GetURI( p_item->p_input );
}
[o_mi_revealInFinder setEnabled: NO];
[o_mm_mi_revealInFinder setEnabled: NO];
+
+ 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];
+ }
}
}
unsigned int j;
// FIXME: unsafe
- playlist_t *p_playlist = pl_Yield( VLCIntf );
+ 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;
}
}
- vlc_object_release( p_playlist );
-
+ PL_UNLOCK;
+ pl_Release( VLCIntf );
}
/* Check if p_item is a child of p_node recursively. We need to check the item
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;
}
else if ( i == p_playlist->all_items.i_size - 1 )
{
if(!b_locked) PL_UNLOCK;
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
return NO;
}
}
if( p_temp_item == p_node )
{
if(!b_locked) PL_UNLOCK;
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
return YES;
}
}
if(!b_locked) PL_UNLOCK;
}
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
return NO;
}
- (IBAction)savePlaylist:(id)sender
{
- playlist_t * p_playlist = pl_Yield( VLCIntf );
+ playlist_t * p_playlist = pl_Hold( VLCIntf );
NSSavePanel *o_save_panel = [NSSavePanel savePanel];
NSString * o_name = [NSString stringWithFormat: @"%@", _NS("Untitled")];
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;
}
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
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
{
}
}
}
- 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;
}
o_to_delete = [NSMutableArray arrayWithArray:[[o_outline_view selectedRowEnumerator] allObjects]];
i_count = [o_to_delete count];
- p_playlist = pl_Yield( p_intf );
+ p_playlist = pl_Hold( p_intf );
PL_LOCK;
for( int i = 0; i < i_count; i++ )
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 locked:YES] == YES )
// if current item is in selected node and is playing then stop playlist
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->p_parent, i_mode, ORDER_NORMAL );
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;
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_item_AddOption( p_input, strdup( [[o_options objectAtIndex:i] UTF8String] ) );
+ input_item_AddOption( p_input, strdup( [[o_options objectAtIndex:i] UTF8String] ),
+ VLC_INPUT_OPTION_TRUSTED );
}
}
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++ )
{
playlist_item_t *p_item = NULL;
playlist_item_t *p_node = NULL;
- p_item = playlist_ItemGetByInput( p_playlist, p_input, pl_Locked );
+ p_item = playlist_ItemGetByInput( p_playlist, p_input );
if( p_item )
{
if( p_item->i_children == -1 )
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++ )
{
if( i_item == 0 && !b_enqueue )
{
playlist_item_t *p_item;
- p_item = playlist_ItemGetByInput( p_playlist, p_input, pl_Locked );
+ 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;
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_author rangeOfString:[o_search_field
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
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;
}
playlist_RecursiveNodeSort( p_playlist, p_playlist->p_root_category, i_mode, i_type );
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]
{
[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;
- ret_v = intf_UserStringInput( p_playlist, _("New Node"),
- _("Please enter a name for the new node."), &psz_name );
-
PL_LOCK;
- if( ret_v != DIALOG_CANCELLED && psz_name )
- {
- playlist_NodeCreate( p_playlist, psz_name,
+ playlist_NodeCreate( p_playlist, _("Empty Folder"),
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 */
- playlist_NodeCreate( p_playlist, _("Empty Folder"),
- p_playlist->p_local_category, 0, NULL );
- }
PL_UNLOCK;
- free( psz_name );
pl_Release( VLCIntf );
- [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:
[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]]];
- (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 */
[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;
}
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;
}
[o_outline_view selectRow: i_row byExtendingSelection: NO];
[o_outline_view scrollRowToVisible: i_row];
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
return YES;
}
[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;
}
@end
projects / vlc / blobdiff