}
- (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 );
[self initStrings];
{
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 )
{
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 */
}
if( p_item && index < p_item->i_children && index >= 0 )
p_return = p_item->pp_children[index];
-
+ PL_UNLOCK;
+
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" );
+ /* 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];
}
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 */
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 );
else
{
char *psz_name = input_item_GetName( p_item->p_input );
- if( !EMPTY_STR( psz_name ) )
- {
+ if( psz_name )
o_value = [NSString stringWithUTF8String: 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];
+ 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 = input_item_GetDuration( p_item->p_input );
- 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 self;
}
+- (void)dealloc
+{
+ [o_nodes_array release];
+ [o_items_array release];
+ [super dealloc];
+}
+
- (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 );
[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")];
+ [[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_mm_mi_services setTitle: _NS("Services discovery")];
[o_status_field setStringValue: _NS("No items in the playlist")];
[o_search_field setToolTip: _NS("Search in Playlist")];
[[[[VLCMain sharedInstance] getWizard] getPlaylistWizard] reloadOutlineView];
[[[[VLCMain sharedInstance] getBookmarks] getDataTable] 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")];
}
+ PL_UNLOCK;
vlc_object_release( p_playlist );
[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( 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 );
+ 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];
}
}
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;
+ p_item = playlist_CurrentPlayingItem( p_playlist );
if( p_item == NULL )
{
- vlc_object_release(p_playlist);
+ pl_Release( VLCIntf );
return;
}
}
- vlc_object_release( p_playlist );
-
+ 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 )
- (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")];
- (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;
vlc_object_release( p_playlist );
}
+- (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
{
[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 );
+ }
+ }
+ vlc_object_release( p_playlist );
+ [self playlistUpdated];
+}
+
- (IBAction)servicesChange:(id)sender
{
NSMenuItem *o_mi = (NSMenuItem *)sender;
NSString *o_string = [o_mi representedObject];
- playlist_t * p_playlist = 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_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
- (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 )
- (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_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;
{
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] ) );
}
}
- (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++ )
if( i_item == 0 && !b_enqueue )
{
- playlist_item_t *p_item;
+ playlist_item_t *p_item = NULL;
+ playlist_item_t *p_node = NULL;
p_item = playlist_ItemGetByInput( p_playlist, p_input, pl_Locked );
- playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, pl_Locked, NULL, p_item );
+ 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 );
}
- (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++ )
{
{
playlist_item_t *p_item;
p_item = playlist_ItemGetByInput( p_playlist, p_input, pl_Locked );
- playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, pl_Locked, NULL, p_item );
+ playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, pl_Locked, p_node, p_item );
}
PL_UNLOCK;
vlc_gc_decref( p_input );
- (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;
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);
- (IBAction)searchItem:(id)sender
{
- playlist_t * p_playlist = pl_Yield( VLCIntf );
+ playlist_t * p_playlist = pl_Hold( VLCIntf );
id o_result;
unsigned int i;
pt = [o_outline_view convertPoint: [o_event locationInWindow]
fromView: nil];
- NSInteger row = [o_outline_view rowAtPoint:pt];
+ int row = [o_outline_view rowAtPoint:pt];
if( row != -1 )
[o_outline_view selectRowIndexes:[NSIndexSet indexSetWithIndex:row] byExtendingSelection:NO];
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*/
i_type = ORDER_NORMAL;
}
- vlc_object_lock( p_playlist );
+ PL_LOCK;
playlist_RecursiveNodeSort( p_playlist, p_playlist->p_root_category, i_mode, i_type );
- vlc_object_unlock( p_playlist );
+ PL_UNLOCK;
vlc_object_release( p_playlist );
[self playlistUpdated];
forTableColumn:(NSTableColumn *)tableColumn
item:(id)item
{
- playlist_t *p_playlist = pl_Yield( VLCIntf );
+ playlist_t *p_playlist = pl_Hold( VLCIntf );
id o_playing_item;
o_playing_item = [o_outline_dict objectForKey:
- [NSString stringWithFormat:@"%p", p_playlist->status.p_item]];
+ [NSString stringWithFormat:@"%p", playlist_CurrentPlayingItem( p_playlist )]];
if( [self isItem: [o_playing_item pointerValue] inNode:
[item pointerValue] checkItemExistence: YES]
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( ret_v != DIALOG_CANCELLED && psz_name && *psz_name )
- p_item = playlist_NodeCreate( p_playlist, psz_name,
+ PL_LOCK;
+ if( ret_v != DIALOG_CANCELLED && psz_name )
+ {
+ 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"),
+ 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" );
-
- vlc_object_release( p_playlist );
+ free( psz_name );
+ pl_Release( VLCIntf );
[ourPool release];
}
- (id)outlineView:(NSOutlineView *)outlineView child:(int)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")];
}
}
+ PL_UNLOCK;
+
vlc_object_release( p_playlist );
[o_outline_dict setObject:o_value forKey:[NSString stringWithFormat:@"%p",
- (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 */
(Service Discovery) */
if( ![self isItem: [o_item pointerValue] inNode:
p_playlist->p_local_category checkItemExistence: NO] &&
- ( var_CreateGetBool( p_playlist, "media-library" ) &&
+ var_CreateGetBool( p_playlist, "media-library" ) &&
![self isItem: [o_item pointerValue] inNode:
- p_playlist->p_ml_category checkItemExistence: NO]) )
+ 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);
return NO;
- (NSDragOperation)outlineView:(NSOutlineView *)outlineView validateDrop:(id <NSDraggingInfo>)info proposedItem:(id)item proposedChildIndex:(int)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;
- (BOOL)outlineView:(NSOutlineView *)outlineView acceptDrop:(id <NSDraggingInfo>)info item:(id)item childIndex:(int)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 */
projects / vlc / blobdiff