/*****************************************************************************
* playlist.m: MacOS X interface module
*****************************************************************************
-* Copyright (C) 2002-2012 VLC authors and VideoLAN
+* Copyright (C) 2002-2014 VLC authors and VideoLAN
* $Id$
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
#include <math.h>
#include <sys/mount.h>
+#import "CompatibilityFixes.h"
+
#import "intf.h"
#import "wizard.h"
#import "bookmarks.h"
#import "misc.h"
#import "open.h"
#import "MainMenu.h"
+#import "CoreInteraction.h"
#include <vlc_keys.h>
-#import <vlc_osd.h>
#import <vlc_interface.h>
-
#include <vlc_url.h>
/*****************************************************************************
return NO;
}
-- (BOOL) acceptsFirstResponder
+- (BOOL)acceptsFirstResponder
{
return YES;
}
-- (BOOL) becomeFirstResponder
+- (BOOL)becomeFirstResponder
{
[self setNeedsDisplay:YES];
return YES;
}
-- (BOOL) resignFirstResponder
+- (BOOL)resignFirstResponder
{
[self setNeedsDisplay:YES];
return YES;
@end
-/*****************************************************************************
- * VLCPlaylistCommon implementation
- *
- * This class the superclass of the VLCPlaylist and VLCPlaylistWizard.
- * It contains the common methods and elements of these 2 entities.
- *****************************************************************************/
-@implementation VLCPlaylistCommon
-
-- (id)init
-{
- playlist_t * p_playlist = pl_Get(VLCIntf);
- p_current_root_item = p_playlist->p_local_category;
-
- self = [super init];
- if (self != nil)
- o_outline_dict = [[NSMutableDictionary alloc] init];
-
- return self;
-}
-
-- (void)awakeFromNib
-{
- playlist_t * p_playlist = pl_Get(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]];
-
- [o_outline_view_other setTarget: self];
- [o_outline_view_other setDelegate: self];
- [o_outline_view_other setDataSource: self];
- [o_outline_view_other setAllowsEmptySelection: NO];
-
- [[o_tc_name_other headerCell] setStringValue:_NS("Name")];
- [[o_tc_author_other headerCell] setStringValue:_NS("Author")];
- [[o_tc_duration_other headerCell] setStringValue:_NS("Duration")];
-}
-
-- (void)setPlaylistRoot: (playlist_item_t *)root_item
-{
- p_current_root_item = root_item;
- [o_outline_view reloadData];
- [o_outline_view_other reloadData];
-}
-
-- (playlist_item_t *)currentPlaylistRoot
-{
- return p_current_root_item;
-}
-
-- (NSOutlineView *)outlineView
-{
- return o_outline_view;
-}
-
-- (playlist_item_t *)selectedPlaylistItem
-{
- return [[o_outline_view itemAtRow: [o_outline_view selectedRow]]
- pointerValue];
-}
-
-@end
-
-@implementation VLCPlaylistCommon (NSOutlineViewDataSource)
-/* return the number of children for Obj-C pointer item */ /* DONE */
-- (NSInteger)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item
-{
- int i_return = 0;
- playlist_item_t *p_item = NULL;
- playlist_t * p_playlist = pl_Get(VLCIntf);
- //assert(outlineView == o_outline_view);
-
- PL_LOCK;
- if (!item)
- p_item = p_current_root_item;
- else
- p_item = (playlist_item_t *)[item pointerValue];
-
- if (p_item)
- i_return = p_item->i_children;
- PL_UNLOCK;
-
- return i_return > 0 ? i_return : 0;
-}
-
-/* return the child at index for the Obj-C pointer item */ /* DONE */
-- (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_Get(VLCIntf);
-
- PL_LOCK;
- if (item == nil)
- p_item = p_current_root_item; /* root object */
- else
- p_item = (playlist_item_t *)[item pointerValue];
-
- if (p_item && index < p_item->i_children && index >= 0)
- p_return = p_item->pp_children[index];
- PL_UNLOCK;
-
- o_value = [o_outline_dict objectForKey:[NSString stringWithFormat: @"%p", p_return]];
-
- if (o_value == nil) {
- /* FIXME: 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;
-}
-
-/* is the item expandable */
-- (BOOL)outlineView:(NSOutlineView *)outlineView isItemExpandable:(id)item
-{
- int i_return = 0;
- playlist_t *p_playlist = pl_Get(VLCIntf);
-
- PL_LOCK;
- if (item == nil) {
- /* root object */
- if (p_current_root_item) {
- i_return = p_current_root_item->i_children;
- }
- } else {
- playlist_item_t *p_item = (playlist_item_t *)[item pointerValue];
- if (p_item)
- i_return = p_item->i_children;
- }
- PL_UNLOCK;
-
- return (i_return >= 0);
-}
-
-/* retrieve the string values for the cells */
-- (id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTableColumn *)o_tc byItem:(id)item
-{
- id o_value = nil;
- char * psz_value;
- playlist_item_t *p_item;
-
- /* For error handling */
- static BOOL attempted_reload = NO;
-
- if (item == nil || ![item isKindOfClass: [NSValue class]]) {
- /* Attempt to fix the error by asking for a data redisplay
- * This might cause infinite loop, so add a small check */
- if (!attempted_reload) {
- attempted_reload = YES;
- [outlineView reloadData];
- }
- return @"error" ;
- }
-
- p_item = (playlist_item_t *)[item pointerValue];
- if (!p_item || !p_item->p_input) {
- /* Attempt to fix the error by asking for a data redisplay
- * This might cause infinite loop, so add a small check */
- if (!attempted_reload) {
- attempted_reload = YES;
- [outlineView reloadData];
- }
- return @"error";
- }
-
- attempted_reload = NO;
- NSString * o_identifier = [o_tc identifier];
-
- if ([o_identifier isEqualToString:TRACKNUM_COLUMN]) {
- psz_value = input_item_GetTrackNumber(p_item->p_input);
- if (psz_value) {
- o_value = [NSString stringWithUTF8String: psz_value];
- free(psz_value);
- }
- } else if ([o_identifier isEqualToString:TITLE_COLUMN]) {
- /* sanity check to prevent the NSString class from crashing */
- char *psz_title = input_item_GetTitleFbName(p_item->p_input);
- if (psz_title) {
- o_value = [NSString stringWithUTF8String: psz_title];
- free(psz_title);
- }
- } else if ([o_identifier isEqualToString:ARTIST_COLUMN]) {
- psz_value = input_item_GetArtist(p_item->p_input);
- if (psz_value) {
- o_value = [NSString stringWithUTF8String: psz_value];
- free(psz_value);
- }
- } else if ([o_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
- o_value = @"--:--";
- } else if ([o_identifier isEqualToString:GENRE_COLUMN]) {
- psz_value = input_item_GetGenre(p_item->p_input);
- if (psz_value) {
- o_value = [NSString stringWithUTF8String: psz_value];
- free(psz_value);
- }
- } else if ([o_identifier isEqualToString:ALBUM_COLUMN]) {
- psz_value = input_item_GetAlbum(p_item->p_input);
- if (psz_value) {
- o_value = [NSString stringWithUTF8String: psz_value];
- free(psz_value);
- }
- } else if ([o_identifier isEqualToString:DESCRIPTION_COLUMN]) {
- psz_value = input_item_GetDescription(p_item->p_input);
- if (psz_value) {
- o_value = [NSString stringWithUTF8String: psz_value];
- free(psz_value);
- }
- } else if ([o_identifier isEqualToString:DATE_COLUMN]) {
- psz_value = input_item_GetDate(p_item->p_input);
- if (psz_value) {
- o_value = [NSString stringWithUTF8String: psz_value];
- free(psz_value);
- }
- } else if ([o_identifier isEqualToString:LANGUAGE_COLUMN]) {
- psz_value = input_item_GetLanguage(p_item->p_input);
- if (psz_value) {
- o_value = [NSString stringWithUTF8String: psz_value];
- free(psz_value);
- }
- }
- else if ([o_identifier isEqualToString:URI_COLUMN]) {
- psz_value = decode_URI(input_item_GetURI(p_item->p_input));
- if (psz_value) {
- o_value = [NSString stringWithUTF8String: psz_value];
- free(psz_value);
- }
- }
- else if ([o_identifier isEqualToString:@"status"]) {
- if (input_item_HasErrorWhenReading(p_item->p_input)) {
- o_value = [[NSWorkspace sharedWorkspace] iconForFileType:NSFileTypeForHFSTypeCode(kAlertCautionIcon)];
- [o_value setSize: NSMakeSize(16,16)];
- }
- }
-
- return o_value;
-}
-
-@end
-
/*****************************************************************************
* VLCPlaylistWizard implementation
*****************************************************************************/
{
/* Only reload the outlineview if the wizard window is open since this can
be quite long on big playlists */
- if ([[o_outline_view window] isVisible])
- [o_outline_view reloadData];
+
+
+ // to be removed
}
@end
/*****************************************************************************
* VLCPlaylist implementation
*****************************************************************************/
-@interface VLCPlaylist (Internal)
+@interface VLCPlaylist ()
+{
+ NSImage *o_descendingSortingImage;
+ NSImage *o_ascendingSortingImage;
+
+ BOOL b_selected_item_met;
+ BOOL b_isSortDescending;
+ id o_tc_sortColumn;
+ NSUInteger retainedRowSelection;
+
+ BOOL b_playlistmenu_nib_loaded;
+ BOOL b_view_setup;
+}
+
- (void)saveTableColumns;
@end
@implementation VLCPlaylist
-+ (void)initialize{
++ (void)initialize
+{
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
- NSMutableArray * o_columnArray = [[NSMutableArray alloc] init];
- [o_columnArray addObject: [NSArray arrayWithObjects: TITLE_COLUMN, [NSNumber numberWithFloat: 190.], nil]];
- [o_columnArray addObject: [NSArray arrayWithObjects: ARTIST_COLUMN, [NSNumber numberWithFloat: 95.], nil]];
- [o_columnArray addObject: [NSArray arrayWithObjects: DURATION_COLUMN, [NSNumber numberWithFloat: 95.], nil]];
- NSDictionary *appDefaults = [NSDictionary dictionaryWithObject:[NSArray arrayWithArray:o_columnArray] forKey:@"PlaylistColumnSelection"];
+ NSMutableArray *o_columnArray = [[NSMutableArray alloc] init];
+ [o_columnArray addObject: [NSArray arrayWithObjects:TITLE_COLUMN, [NSNumber numberWithFloat:190.], nil]];
+ [o_columnArray addObject: [NSArray arrayWithObjects:ARTIST_COLUMN, [NSNumber numberWithFloat:95.], nil]];
+ [o_columnArray addObject: [NSArray arrayWithObjects:DURATION_COLUMN, [NSNumber numberWithFloat:95.], nil]];
+
+ NSDictionary *appDefaults = [NSDictionary dictionaryWithObjectsAndKeys:
+ [NSArray arrayWithArray:o_columnArray], @"PlaylistColumnSelection",
+ [NSArray array], @"recentlyPlayedMediaList",
+ [NSDictionary dictionary], @"recentlyPlayedMedia", nil];
[defaults registerDefaults:appDefaults];
[o_columnArray release];
}
-- (id)init
+- (PLModel *)model
+{
+ return o_model;
+}
+
+- (void)reloadStyles
{
- self = [super init];
- if (self != nil) {
- o_nodes_array = [[NSMutableArray alloc] init];
- o_items_array = [[NSMutableArray alloc] init];
+ NSFont *fontToUse;
+ CGFloat rowHeight;
+ if (config_GetInt(VLCIntf, "macosx-large-text")) {
+ fontToUse = [NSFont systemFontOfSize:13.];
+ rowHeight = 21.;
+ } else {
+ fontToUse = [NSFont systemFontOfSize:11.];
+ rowHeight = 16.;
}
- return self;
+
+ NSArray *columns = [o_outline_view tableColumns];
+ NSUInteger count = columns.count;
+ for (NSUInteger x = 0; x < count; x++)
+ [[[columns objectAtIndex:x] dataCell] setFont:fontToUse];
+ [o_outline_view setRowHeight:rowHeight];
}
- (void)dealloc
{
- [o_nodes_array release];
- [o_items_array release];
[super dealloc];
}
- (void)awakeFromNib
{
+ if (b_view_setup)
+ return;
+
playlist_t * p_playlist = pl_Get(VLCIntf);
- [super awakeFromNib];
+ [self reloadStyles];
+ [self initStrings];
+ o_model = [[PLModel alloc] initWithOutlineView:o_outline_view playlist:p_playlist rootItem:p_playlist->p_playing playlistObject:self];
+ [o_outline_view setDataSource:o_model];
+ [o_outline_view reloadData];
+
+ [o_outline_view setTarget: self];
[o_outline_view setDoubleAction: @selector(playItem:)];
- [o_outline_view_other setDoubleAction: @selector(playItem:)];
- [o_outline_view registerForDraggedTypes:
- [NSArray arrayWithObjects: NSFilenamesPboardType,
- @"VLCPlaylistItemPboardType", nil]];
+ [o_outline_view setAllowsEmptySelection: NO];
+ [o_outline_view registerForDraggedTypes: [NSArray arrayWithObjects:NSFilenamesPboardType, @"VLCPlaylistItemPboardType", nil]];
[o_outline_view setIntercellSpacing: NSMakeSize (0.0, 1.0)];
- [o_outline_view_other registerForDraggedTypes:
- [NSArray arrayWithObjects: NSFilenamesPboardType,
- @"VLCPlaylistItemPboardType", nil]];
- [o_outline_view_other setIntercellSpacing: NSMakeSize (0.0, 1.0)];
-
/* This uses a private API, but works fine on all current OSX releases.
* Radar ID 11739459 request a public API for this. However, it is probably
* easier and faster to recreate similar looking bitmaps ourselves. */
if ([o_column isEqualToString:@"status"])
continue;
- [o_menu setPlaylistColumnTableState: NSOnState forColumn: o_column];
+ if(![o_menu setPlaylistColumnTableState: NSOnState forColumn: o_column])
+ continue;
+
[[o_outline_view tableColumnWithIdentifier: o_column] setWidth: [[[o_columnArray objectAtIndex:i] objectAtIndex:1] floatValue]];
}
[[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(applicationWillTerminate:) name: NSApplicationWillTerminateNotification object: nil];
+
+ b_view_setup = YES;
}
- (void)applicationWillTerminate:(NSNotification *)notification
[self saveTableColumns];
}
-- (void)searchfieldChanged:(NSNotification *)o_notification
-{
- [o_search_field setStringValue:[[o_notification object] stringValue]];
-}
-
- (void)initStrings
{
- [o_mi_save_playlist setTitle: _NS("Save Playlist...")];
[o_mi_play setTitle: _NS("Play")];
[o_mi_delete setTitle: _NS("Delete")];
[o_mi_recursive_expand setTitle: _NS("Expand Node")];
[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_search_field setToolTip: _NS("Search in Playlist")];
- [o_search_field_other setToolTip: _NS("Search in Playlist")];
-
- [o_save_accessory_text setStringValue: _NS("File Format:")];
- [[o_save_accessory_popup itemAtIndex:0] setTitle: _NS("Extended M3U")];
- [[o_save_accessory_popup itemAtIndex:1] setTitle: _NS("XML Shareable Playlist Format (XSPF)")];
- [[o_save_accessory_popup itemAtIndex:2] setTitle: _NS("HTML Playlist")];
}
- (void)playlistUpdated
{
- /* Clear indications of any existing column sorting */
- NSUInteger count = [[o_outline_view tableColumns] count];
- for (NSUInteger i = 0 ; i < count ; i++)
- [o_outline_view setIndicatorImage:nil inTableColumn: [[o_outline_view tableColumns] objectAtIndex:i]];
-
- [o_outline_view setHighlightedTableColumn:nil];
- o_tc_sortColumn = nil;
- // TODO Find a way to keep the dict size to a minimum
- //[o_outline_dict removeAllObjects];
[o_outline_view reloadData];
- [[[[VLCMain sharedInstance] wizard] playlistWizard] reloadOutlineView];
- [[[[VLCMain sharedInstance] bookmarks] dataTable] reloadData];
-
- [self outlineViewSelectionDidChange: nil];
- [[VLCMain sharedInstance] updateMainWindow];
}
- (void)outlineViewSelectionDidChange:(NSNotification *)notification
{
- // FIXME: unsafe
- playlist_item_t * p_item = [[o_outline_view itemAtRow:[o_outline_view selectedRow]] pointerValue];
-
- if (p_item) {
- /* 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 (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];
- }
- free(psz_uri);
- }
-
- /* update our info-panel to reflect the new item */
- [[[VLCMain sharedInstance] info] updatePanelWithItem:p_item->p_input];
- }
+// // FIXME: unsafe
+// playlist_item_t * p_item = [[o_outline_view itemAtRow:[o_outline_view selectedRow]] pointerValue];
+//
+// if (p_item) {
+// /* 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 (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];
+// }
+// free(psz_uri);
+// }
+//
+// /* update our info-panel to reflect the new item */
+// [[[VLCMain sharedInstance] info] updatePanelWithItem:p_item->p_input];
+// }
}
- (BOOL)isSelectionEmpty
return [o_outline_view selectedRow] == -1;
}
-- (void)updateRowSelection
+- (void)currentlyPlayingItemChanged
{
- // FIXME: unsafe
- playlist_t *p_playlist = pl_Get(VLCIntf);
- playlist_item_t *p_item, *p_temp_item;
- NSMutableArray *o_array = [NSMutableArray array];
-
- PL_LOCK;
- p_item = playlist_CurrentPlayingItem(p_playlist);
- if (p_item == NULL) {
- PL_UNLOCK;
+ PLItem *item = [[self model] currentlyPlayingItem];
+ if (!item)
return;
- }
-
- p_temp_item = p_item;
- while(p_temp_item->p_parent) {
- [o_array insertObject: [NSValue valueWithPointer: p_temp_item] atIndex: 0];
- p_temp_item = p_temp_item->p_parent;
- }
- PL_UNLOCK;
-
- NSUInteger count = [o_array count];
- for (NSUInteger j = 0; j < count - 1; j++) {
- id o_item;
- if ((o_item = [o_outline_dict objectForKey:
- [NSString stringWithFormat: @"%p",
- [[o_array objectAtIndex:j] pointerValue]]]) != nil) {
- [o_outline_view expandItem: o_item];
- }
- }
-
- id o_item = [o_outline_dict objectForKey:[NSString stringWithFormat: @"%p", p_item]];
- NSInteger i_index = [o_outline_view rowForItem:o_item];
- [o_outline_view selectRowIndexes:[NSIndexSet indexSetWithIndex:i_index] byExtendingSelection:NO];
- [o_outline_view setNeedsDisplay:YES];
-}
-
-/* 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
- 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_Get(VLCIntf);
- playlist_item_t *p_temp_item = p_item;
-
- if (!p_node)
- return NO;
- if (p_node == p_item)
- return YES;
-
- if (p_node->i_children < 1)
- return NO;
+ // select item
+ NSInteger itemIndex = [o_outline_view rowForItem:item];
+ if (itemIndex < 0) {
+ // expand if needed
+ while (item != nil) {
+ PLItem *parent = [item parent];
- if (p_temp_item) {
- int i;
- if (!b_locked) PL_LOCK;
-
- if (b_check) {
- /* Since outlineView: willDisplayCell:... may call this function with
- p_items that don't exist anymore, first check if the item is still
- in the playlist. Any cleaner solution welcomed. */
- for (i = 0; i < p_playlist->all_items.i_size; i++) {
- if (ARRAY_VAL(p_playlist->all_items, i) == p_item)
- break;
- else if (i == p_playlist->all_items.i_size - 1)
- {
- if (!b_locked) PL_UNLOCK;
- return NO;
- }
- }
+ if (![o_outline_view isExpandable: parent])
+ break;
+ if (![o_outline_view isItemExpanded: parent])
+ [o_outline_view expandItem: parent];
+ item = parent;
}
- while(p_temp_item) {
- p_temp_item = p_temp_item->p_parent;
- if (p_temp_item == p_node) {
- if (!b_locked) PL_UNLOCK;
- return YES;
- }
+ // search for row again
+ itemIndex = [o_outline_view rowForItem:item];
+ if (itemIndex < 0) {
+ return;
}
- if (!b_locked) PL_UNLOCK;
}
- return NO;
-}
-/* This method is useful for instance to remove the selected children of an
- already selected node */
-- (void)removeItemsFrom:(id)o_items ifChildrenOf:(id)o_nodes
-{
- NSUInteger itemCount = [o_items count];
- NSUInteger nodeCount = [o_nodes count];
- for (NSUInteger i = 0 ; i < itemCount ; i++) {
- for (NSUInteger j = 0 ; j < nodeCount ; j++) {
- if (o_items == o_nodes) {
- if (j == i) continue;
- }
- if ([self isItem: [[o_items objectAtIndex:i] pointerValue]
- inNode: [[o_nodes objectAtIndex:j] pointerValue]
- checkItemExistence: NO locked:NO]) {
- [o_items removeObjectAtIndex:i];
- /* We need to execute the next iteration with the same index
- since the current item has been deleted */
- i--;
- break;
- }
- }
- }
+ [o_outline_view selectRowIndexes: [NSIndexSet indexSetWithIndex: itemIndex] byExtendingSelection: NO];
}
- (IBAction)savePlaylist:(id)sender
NSSavePanel *o_save_panel = [NSSavePanel savePanel];
NSString * o_name = [NSString stringWithFormat: @"%@", _NS("Untitled")];
+ [NSBundle loadNibNamed:@"PlaylistAccessoryView" owner:self];
+
+ [o_save_accessory_text setStringValue: _NS("File Format:")];
+ [[o_save_accessory_popup itemAtIndex:0] setTitle: _NS("Extended M3U")];
+ [[o_save_accessory_popup itemAtIndex:1] setTitle: _NS("XML Shareable Playlist Format (XSPF)")];
+ [[o_save_accessory_popup itemAtIndex:2] setTitle: _NS("HTML playlist")];
+
[o_save_panel setTitle: _NS("Save Playlist")];
[o_save_panel setPrompt: _NS("Save")];
[o_save_panel setAccessoryView: o_save_accessory_view];
/* 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_Get(p_intf);
-
- playlist_item_t *p_item;
- playlist_item_t *p_node = NULL;
+ playlist_t *p_playlist = pl_Get(VLCIntf);
// ignore clicks on column header when handling double action
- if (sender != nil && [o_outline_view clickedRow] == -1 && sender != o_mi_play)
+ if (sender == o_outline_view && [o_outline_view clickedRow] == -1)
return;
- p_item = [[o_outline_view itemAtRow:[o_outline_view selectedRow]] pointerValue];
+ PLItem *o_item = [o_outline_view itemAtRow:[o_outline_view selectedRow]];
+ if (!o_item)
+ return;
PL_LOCK;
- 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_item_t *p_item = playlist_ItemGetById(p_playlist, [o_item plItemId]);
+ playlist_item_t *p_node = playlist_ItemGetById(p_playlist, [[[self model] rootItem] plItemId]);
+
+ if (p_item && p_node) {
playlist_Control(p_playlist, PLAYLIST_VIEWPLAY, pl_Locked, p_node, p_item);
}
PL_UNLOCK;
- (IBAction)revealItemInFinder:(id)sender
{
- NSIndexSet * selectedRows = [o_outline_view selectedRowIndexes];
- NSUInteger count = [selectedRows count];
- NSUInteger indexes[count];
- [selectedRows getIndexes:indexes maxCount:count inIndexRange:nil];
+ NSIndexSet *selectedRows = [o_outline_view selectedRowIndexes];
+ [selectedRows enumerateIndexesUsingBlock:^(NSUInteger idx, BOOL *stop) {
- NSMutableString * o_mrl;
- playlist_item_t *p_item;
- for (NSUInteger i = 0; i < count; i++) {
- p_item = [[o_outline_view itemAtRow:indexes[i]] pointerValue];
-
- if (! p_item || !p_item->p_input)
- continue;
-
- char * psz_url = decode_URI(input_item_GetURI(p_item->p_input));
- o_mrl = [[NSMutableString alloc] initWithString: [NSString stringWithUTF8String: psz_url ? psz_url : ""]];
- if (psz_url != NULL)
- free( psz_url );
+ PLItem *o_item = [o_outline_view itemAtRow:idx];
/* perform some checks whether it is a file and if it is local at all... */
- if ([o_mrl length] > 0) {
- NSRange prefix_range = [o_mrl rangeOfString: @"file:"];
- if (prefix_range.location != NSNotFound)
- [o_mrl deleteCharactersInRange: prefix_range];
+ char *psz_url = input_item_GetURI([o_item input]);
+ NSURL *url = [NSURL URLWithString:toNSStr(psz_url)];
+ free(psz_url);
+ if (![url isFileURL])
+ return;
+ if (![[NSFileManager defaultManager] fileExistsAtPath:[url path]])
+ return;
- if ([o_mrl characterAtIndex:0] == '/')
- [[NSWorkspace sharedWorkspace] selectFile: o_mrl inFileViewerRootedAtPath: o_mrl];
- }
+ msg_Dbg(VLCIntf, "Reveal url %s in finder", [[url path] UTF8String]);
+ [[NSWorkspace sharedWorkspace] selectFile: [url path] inFileViewerRootedAtPath: [url path]];
+ }];
- [o_mrl release];
- }
}
/* When called retrieves the selected outlineview row and plays that node or item */
NSUInteger indexes[i_count];
[o_selected_indexes getIndexes:indexes maxCount:i_count inIndexRange:nil];
for (int i = 0; i < i_count; i++) {
- p_item = [[o_outline_view itemAtRow:indexes[i]] pointerValue];
+ PLItem *o_item = [o_outline_view itemAtRow:indexes[i]];
[o_outline_view deselectRow: indexes[i]];
- if (p_item) {
- if (p_item->i_children == -1)
- playlist_PreparseEnqueue(p_playlist, p_item->p_input);
- else
- msg_Dbg(p_intf, "preparsing nodes not implemented");
+ if (![o_item isLeaf]) {
+ msg_Dbg(p_intf, "preparsing nodes not implemented");
+ continue;
}
+
+ libvlc_MetaRequest(p_intf->p_libvlc, [o_item input], META_REQUEST_OPTION_NONE);
+
}
[self playlistUpdated];
}
NSUInteger indexes[i_count];
[o_selected_indexes getIndexes:indexes maxCount:i_count inIndexRange:nil];
for (int i = 0; i < i_count; i++) {
- p_item = [[o_outline_view itemAtRow: indexes[i]] pointerValue];
+ PLItem *o_item = [o_outline_view itemAtRow: indexes[i]];
+
+ if (![o_item isLeaf])
+ continue;
- if (p_item && p_item->i_children == -1)
- playlist_AskForArtEnqueue(p_playlist, p_item->p_input);
+ libvlc_ArtRequest(p_intf->p_libvlc, [o_item input], META_REQUEST_OPTION_NONE);
}
[self playlistUpdated];
}
[o_outline_view selectAll: nil];
}
-- (IBAction)deleteItem:(id)sender
+- (IBAction)showInfoPanel:(id)sender
{
- int i_count;
- NSIndexSet *o_selected_indexes;
- playlist_t * p_playlist;
- intf_thread_t * p_intf = VLCIntf;
+ [[[VLCMain sharedInstance] info] initPanel];
+}
- o_selected_indexes = [o_outline_view selectedRowIndexes];
- i_count = [o_selected_indexes count];
+- (void)deletionCompleted
+{
+ // retain selection before deletion
+ [o_outline_view selectRowIndexes:[NSIndexSet indexSetWithIndex:retainedRowSelection] byExtendingSelection:NO];
+}
- p_playlist = pl_Get(p_intf);
+- (IBAction)deleteItem:(id)sender
+{
+ playlist_t * p_playlist = pl_Get(VLCIntf);
- NSUInteger indexes[i_count];
- if (i_count == [o_outline_view numberOfRows]) {
-#ifndef NDEBUG
- msg_Dbg(p_intf, "user selected entire list, deleting current playlist root instead of individual items");
-#endif
- PL_LOCK;
- playlist_NodeDelete(p_playlist, [self currentPlaylistRoot], true, false);
- PL_UNLOCK;
- [self playlistUpdated];
+ // check if deletion is allowed
+ if (![[self model] editAllowed])
return;
- }
- [o_selected_indexes getIndexes:indexes maxCount:i_count inIndexRange:nil];
- for (int i = 0; i < i_count; i++) {
- id o_item = [o_outline_view itemAtRow: indexes[i]];
- [o_outline_view deselectRow: indexes[i]];
- PL_LOCK;
- playlist_item_t *p_item = [o_item pointerValue];
- if (!p_item || !p_item->p_input) {
- PL_UNLOCK;
- continue;
- }
-#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
-
- if (p_item->i_children != -1) {
- //is a node and not an item
- 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
- 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, pl_Locked);
+ NSIndexSet *o_selected_indexes = [o_outline_view selectedRowIndexes];
+ retainedRowSelection = [o_selected_indexes firstIndex];
+ if (retainedRowSelection == NSNotFound)
+ retainedRowSelection = 0;
- PL_UNLOCK;
- [o_outline_dict removeObjectForKey:[NSString stringWithFormat:@"%p", [o_item pointerValue]]];
- [o_item release];
- }
+ [o_selected_indexes enumerateIndexesUsingBlock:^(NSUInteger idx, BOOL *stop) {
+ PLItem *o_item = [o_outline_view itemAtRow: idx];
+ if (!o_item)
+ return;
- [self playlistUpdated];
+ // model deletion is done via callback
+ playlist_DeleteFromInput(p_playlist, [o_item input], pl_Unlocked);
+ }];
}
- (IBAction)sortNodeByName:(id)sender
playlist_t * p_playlist = pl_Get(VLCIntf);
playlist_item_t * p_item;
- if ([o_outline_view selectedRow] > -1) {
- p_item = [[o_outline_view itemAtRow: [o_outline_view selectedRow]] pointerValue];
- if (!p_item)
- return;
- } else
- p_item = [self currentPlaylistRoot]; // If no item is selected, sort the whole playlist
-
- PL_LOCK;
- if (p_item->i_children > -1) // the item is a node
- playlist_RecursiveNodeSort(p_playlist, p_item, i_mode, ORDER_NORMAL);
- else
- playlist_RecursiveNodeSort(p_playlist, p_item->p_parent, i_mode, ORDER_NORMAL);
-
- PL_UNLOCK;
- [self playlistUpdated];
+ // TODO why do we need this kind of sort? It looks crap and confusing...
+
+// if ([o_outline_view selectedRow] > -1) {
+// p_item = [[o_outline_view itemAtRow: [o_outline_view selectedRow]] pointerValue];
+// if (!p_item)
+// return;
+// } else
+// p_item = [self currentPlaylistRoot]; // If no item is selected, sort the whole playlist
+//
+// PL_LOCK;
+// if (p_item->i_children > -1) // the item is a node
+// playlist_RecursiveNodeSort(p_playlist, p_item, i_mode, ORDER_NORMAL);
+// else
+// playlist_RecursiveNodeSort(p_playlist, p_item->p_parent, i_mode, ORDER_NORMAL);
+//
+// PL_UNLOCK;
+// [self playlistUpdated];
}
- (input_item_t *)createItem:(NSDictionary *)o_one_item
if ([[NSFileManager defaultManager] fileExistsAtPath:o_path isDirectory:&b_dir] && b_dir &&
[[NSWorkspace sharedWorkspace] getFileSystemInfoForPath:o_path isRemovable: &b_rem
isWritable:&b_writable isUnmountable:NULL description:NULL type:NULL] && b_rem && !b_writable && [o_nsurl isFileURL]) {
- id o_vlc_open = [[VLCMain sharedInstance] open];
- NSString *diskType = [o_vlc_open getVolumeTypeFromMountPath: o_path];
+ NSString *diskType = [VLCOpen getVolumeTypeFromMountPath: o_path];
msg_Dbg(p_intf, "detected optical media of type %s in the file input", [diskType UTF8String]);
if ([diskType isEqualToString: kVLCMediaDVD])
- o_uri = [NSString stringWithFormat: @"dvdnav://%@", [o_vlc_open getBSDNodeFromMountPath: o_path]];
+ o_uri = [NSString stringWithFormat: @"dvdnav://%@", [VLCOpen getBSDNodeFromMountPath: o_path]];
else if ([diskType isEqualToString: kVLCMediaVideoTSFolder])
o_uri = [NSString stringWithFormat: @"dvdnav://%@", o_path];
else if ([diskType isEqualToString: kVLCMediaAudioCD])
- o_uri = [NSString stringWithFormat: @"cdda://%@", [o_vlc_open getBSDNodeFromMountPath: o_path]];
+ o_uri = [NSString stringWithFormat: @"cdda://%@", [VLCOpen getBSDNodeFromMountPath: o_path]];
else if ([diskType isEqualToString: kVLCMediaVCD])
- o_uri = [NSString stringWithFormat: @"vcd://%@#0:0", [o_vlc_open getBSDNodeFromMountPath: o_path]];
+ o_uri = [NSString stringWithFormat: @"vcd://%@#0:0", [VLCOpen getBSDNodeFromMountPath: o_path]];
else if ([diskType isEqualToString: kVLCMediaSVCD])
- o_uri = [NSString stringWithFormat: @"vcd://%@@0:0", [o_vlc_open getBSDNodeFromMountPath: o_path]];
+ o_uri = [NSString stringWithFormat: @"vcd://%@@0:0", [VLCOpen getBSDNodeFromMountPath: o_path]];
else if ([diskType isEqualToString: kVLCMediaBD] || [diskType isEqualToString: kVLCMediaBDMVFolder])
o_uri = [NSString stringWithFormat: @"bluray://%@", o_path];
else
return p_input;
}
-- (void)appendArray:(NSArray*)o_array atPos:(int)i_position enqueue:(BOOL)b_enqueue
+- (void)addPlaylistItems:(NSArray*)o_array
{
- playlist_t * p_playlist = pl_Get(VLCIntf);
- NSUInteger count = [o_array count];
- BOOL b_usingPlaylist;
- if ([self currentPlaylistRoot] == p_playlist->p_ml_category)
- b_usingPlaylist = NO;
- else
- b_usingPlaylist = YES;
-
- PL_LOCK;
- for (NSUInteger i_item = 0; i_item < count; i_item++) {
- input_item_t *p_input;
- NSDictionary *o_one_item;
- /* Get the item */
- o_one_item = [o_array objectAtIndex: i_item];
- p_input = [self createItem: o_one_item];
- if (!p_input)
- continue;
+ int i_plItemId = -1;
- /* Add the item */
- int returnValue = playlist_AddInput(p_playlist, p_input, PLAYLIST_INSERT, i_position == -1 ? PLAYLIST_END : i_position + i_item, b_usingPlaylist, pl_Locked);
- if (returnValue != VLC_SUCCESS) {
- vlc_gc_decref(p_input);
- continue;
- }
+ // add items directly to media library if this is the current root
+ if ([[self model] currentRootType] == ROOT_TYPE_MEDIALIBRARY)
+ i_plItemId = [[[self model] rootItem] plItemId];
- if (i_item == 0 && !b_enqueue) {
- playlist_item_t *p_item = playlist_ItemGetByInput(p_playlist, p_input);
- playlist_Control(p_playlist, PLAYLIST_VIEWPLAY, pl_Locked, p_item->p_parent, p_item);
- }
+ BOOL b_autoplay = var_InheritBool(VLCIntf, "macosx-autoplay");
- vlc_gc_decref(p_input);
- }
- PL_UNLOCK;
- [self playlistUpdated];
+ [self addPlaylistItems:o_array withParentItemId:i_plItemId atPos:-1 startPlayback:b_autoplay];
}
-- (void)appendNodeArray:(NSArray*)o_array inNode:(playlist_item_t *)p_node atPos:(int)i_position enqueue:(BOOL)b_enqueue
+- (void)addPlaylistItems:(NSArray*)o_array withParentItemId:(int)i_plItemId atPos:(int)i_position startPlayback:(BOOL)b_start
{
playlist_t * p_playlist = pl_Get(VLCIntf);
- NSUInteger count = [o_array count];
+ PL_LOCK;
+
+ playlist_item_t *p_parent = NULL;
+ if (i_plItemId >= 0)
+ p_parent = playlist_ItemGetById(p_playlist, i_plItemId);
+ else
+ p_parent = p_playlist->p_playing;
- for (NSUInteger i_item = 0; i_item < count; i_item++) {
- input_item_t *p_input;
- NSDictionary *o_one_item;
+ if (!p_parent) {
+ PL_UNLOCK;
+ return;
+ }
- /* Get the item */
- o_one_item = [o_array objectAtIndex: i_item];
- p_input = [self createItem: o_one_item];
+ NSUInteger count = [o_array count];
+ int i_current_offset = 0;
+ for (NSUInteger i = 0; i < count; ++i) {
+ NSDictionary *o_current_item = [o_array objectAtIndex:i];
+ input_item_t *p_input = [self createItem: o_current_item];
if (!p_input)
continue;
- /* Add the item */
- PL_LOCK;
- playlist_NodeAddInput(p_playlist, p_input, p_node,
- PLAYLIST_INSERT,
- i_position == -1 ?
- PLAYLIST_END : i_position + i_item,
- pl_Locked);
-
+ int i_pos = (i_position == -1) ? PLAYLIST_END : i_position + i_current_offset++;
+ playlist_item_t *p_item = playlist_NodeAddInput(p_playlist, p_input, p_parent,
+ PLAYLIST_INSERT, i_pos, pl_Locked);
+ if (!p_item)
+ continue;
- if (i_item == 0 && !b_enqueue) {
- playlist_item_t *p_item;
- p_item = playlist_ItemGetByInput(p_playlist, p_input);
- playlist_Control(p_playlist, PLAYLIST_VIEWPLAY, pl_Locked, p_node, p_item);
+ if (i == 0 && b_start) {
+ playlist_Control(p_playlist, PLAYLIST_VIEWPLAY, pl_Locked, p_parent, p_item);
}
- PL_UNLOCK;
- vlc_gc_decref(p_input);
+ input_item_Release(p_input);
}
- [self playlistUpdated];
+ PL_UNLOCK;
}
-- (NSMutableArray *)subSearchItem:(playlist_item_t *)p_item
-{
- playlist_t *p_playlist = pl_Get(VLCIntf);
- playlist_item_t *p_selected_item;
- int i_selected_row;
-
- i_selected_row = [o_outline_view selectedRow];
- if (i_selected_row < 0)
- i_selected_row = 0;
-
- p_selected_item = (playlist_item_t *)[[o_outline_view itemAtRow: i_selected_row] pointerValue];
-
- for (NSUInteger i_current = 0; i_current < p_item->i_children ; i_current++) {
- char *psz_temp;
- NSString *o_current_name, *o_current_author;
-
- PL_LOCK;
- o_current_name = [NSString stringWithUTF8String:
- p_item->pp_children[i_current]->p_input->psz_name];
- psz_temp = input_item_GetInfo(p_item->p_input ,
- _("Meta-information"),_("Artist"));
- o_current_author = [NSString stringWithUTF8String: psz_temp];
- free(psz_temp);
- PL_UNLOCK;
-
- if (p_selected_item == p_item->pp_children[i_current] && b_selected_item_met == NO)
- b_selected_item_met = YES;
- else if (p_selected_item == p_item->pp_children[i_current] && b_selected_item_met == YES)
- return NULL;
- else if (b_selected_item_met == YES &&
- ([o_current_name rangeOfString:[o_search_field
- stringValue] options:NSCaseInsensitiveSearch].length ||
- [o_current_author rangeOfString:[o_search_field
- stringValue] options:NSCaseInsensitiveSearch].length))
- /*Adds the parent items in the result array as well, so that we can
- expand the tree*/
- return [NSMutableArray arrayWithObject: [NSValue valueWithPointer: p_item->pp_children[i_current]]];
-
- if (p_item->pp_children[i_current]->i_children > 0) {
- id o_result = [self subSearchItem:
- p_item->pp_children[i_current]];
- if (o_result != NULL) {
- [o_result insertObject: [NSValue valueWithPointer:
- p_item->pp_children[i_current]] atIndex:0];
- return o_result;
- }
- }
- }
- return NULL;
-}
- (IBAction)searchItem:(id)sender
{
- playlist_t * p_playlist = pl_Get(VLCIntf);
- id o_result;
-
- int i_row = -1;
-
- b_selected_item_met = NO;
-
- /* First, only search after the selected item:
- * (b_selected_item_met = NO) */
- o_result = [self subSearchItem:[self currentPlaylistRoot]];
- if (o_result == NULL)
- /* If the first search failed, search again from the beginning */
- o_result = [self subSearchItem:[self currentPlaylistRoot]];
-
- if (o_result != NULL) {
- int i_start;
- if ([[o_result objectAtIndex: 0] pointerValue] == p_playlist->p_local_category)
- i_start = 1;
- else
- i_start = 0;
- NSUInteger count = [o_result count];
-
- for (NSUInteger i = i_start ; i < count - 1 ; i++) {
- [o_outline_view expandItem: [o_outline_dict objectForKey:
- [NSString stringWithFormat: @"%p",
- [[o_result objectAtIndex: i] pointerValue]]]];
- }
- i_row = [o_outline_view rowForItem: [o_outline_dict objectForKey:
- [NSString stringWithFormat: @"%p",
- [[o_result objectAtIndex: count - 1 ]
- pointerValue]]]];
- }
- if (i_row > -1) {
- [o_outline_view selectRowIndexes:[NSIndexSet indexSetWithIndex:i_row] byExtendingSelection:NO];
- [o_outline_view scrollRowToVisible: i_row];
- }
+ [[self model] searchUpdate:[o_search_field stringValue]];
}
- (IBAction)recursiveExpandNode:(id)sender
playlist_item_t *p_item;
for (NSUInteger i = 0; i < count; i++) {
o_item = [o_outline_view itemAtRow: indexes[i]];
- p_item = (playlist_item_t *)[o_item pointerValue];
-
- if (![[o_outline_view dataSource] outlineView: o_outline_view isItemExpandable: o_item])
- o_item = [o_outline_dict objectForKey: [NSString stringWithFormat: @"%p", p_item->p_parent]];
/* We need to collapse the node first, since OSX refuses to recursively
expand an already expanded node, even if children nodes are collapsed. */
- [o_outline_view collapseItem: o_item collapseChildren: YES];
- [o_outline_view expandItem: o_item expandChildren: YES];
+ if ([o_outline_view isExpandable:o_item]) {
+ [o_outline_view collapseItem: o_item collapseChildren: YES];
+ [o_outline_view expandItem: o_item expandChildren: YES];
+ }
selectedRows = [o_outline_view selectedRowIndexes];
[selectedRows getIndexes:indexes maxCount:count inIndexRange:nil];
- (NSMenu *)menuForEvent:(NSEvent *)o_event
{
+ if (!b_playlistmenu_nib_loaded)
+ b_playlistmenu_nib_loaded = [NSBundle loadNibNamed:@"PlaylistMenu" owner:self];
+
NSPoint pt;
bool b_rows;
bool b_item_sel;
b_item_sel = (row != -1 && [o_outline_view selectedRow] != -1);
b_rows = [o_outline_view numberOfRows] != 0;
+ playlist_t *p_playlist = pl_Get(VLCIntf);
+ bool b_del_allowed = [[self model] editAllowed];
+
[o_mi_play setEnabled: b_item_sel];
- [o_mi_delete setEnabled: b_item_sel];
+ [o_mi_delete setEnabled: b_item_sel && b_del_allowed];
[o_mi_selectall setEnabled: b_rows];
[o_mi_info setEnabled: b_item_sel];
[o_mi_preparse setEnabled: b_item_sel];
[o_mi_recursive_expand setEnabled: b_item_sel];
[o_mi_sort_name setEnabled: b_item_sel];
[o_mi_sort_author setEnabled: b_item_sel];
+ [o_mi_dl_cover_art setEnabled: b_item_sel];
- return(o_ctx_menu);
+ return o_ctx_menu;
}
- (void)outlineView: (NSOutlineView *)o_tv didClickTableColumn:(NSTableColumn *)o_tc
playlist_t *p_playlist = pl_Get(p_intf);
- if ([o_identifier isEqualToString:TRACKNUM_COLUMN])
- i_mode = SORT_TRACK_NUMBER;
- else if ([o_identifier isEqualToString:TITLE_COLUMN])
- i_mode = SORT_TITLE;
- else if ([o_identifier isEqualToString:ARTIST_COLUMN])
- i_mode = SORT_ARTIST;
- else if ([o_identifier isEqualToString:GENRE_COLUMN])
- i_mode = SORT_GENRE;
- else if ([o_identifier isEqualToString:DURATION_COLUMN])
- i_mode = SORT_DURATION;
- else if ([o_identifier isEqualToString:ALBUM_COLUMN])
- i_mode = SORT_ALBUM;
- else if ([o_identifier isEqualToString:DESCRIPTION_COLUMN])
- i_mode = SORT_DESCRIPTION;
- else if ([o_identifier isEqualToString:URI_COLUMN])
- i_mode = SORT_URI;
- else
- return;
-
if (o_tc_sortColumn == o_tc)
b_isSortDescending = !b_isSortDescending;
else
else
i_type = ORDER_NORMAL;
- PL_LOCK;
- playlist_RecursiveNodeSort(p_playlist, [self currentPlaylistRoot], i_mode, i_type);
- PL_UNLOCK;
+ [[self model] sortForColumn:o_identifier withMode:i_type];
+
+ // TODO rework, why do we need a full call here?
+// [self playlistUpdated];
+
+ /* Clear indications of any existing column sorting */
+ NSUInteger count = [[o_outline_view tableColumns] count];
+ for (NSUInteger i = 0 ; i < count ; i++)
+ [o_outline_view setIndicatorImage:nil inTableColumn: [[o_outline_view tableColumns] objectAtIndex:i]];
+
+ [o_outline_view setHighlightedTableColumn:nil];
+ o_tc_sortColumn = nil;
- [self playlistUpdated];
o_tc_sortColumn = o_tc;
[o_outline_view setHighlightedTableColumn:o_tc];
- (void)outlineView:(NSOutlineView *)outlineView
- willDisplayCell:(id)cell
- forTableColumn:(NSTableColumn *)tableColumn
- item:(id)item
+ willDisplayCell:(id)cell
+ forTableColumn:(NSTableColumn *)tableColumn
+ item:(id)item
{
/* this method can be called when VLC is already dead, hence the extra checks */
intf_thread_t * p_intf = VLCIntf;
if (!p_intf)
return;
playlist_t *p_playlist = pl_Get(p_intf);
- if (!p_playlist)
- return;
-
- id o_playing_item;
- PL_LOCK;
- o_playing_item = [o_outline_dict objectForKey: [NSString stringWithFormat:@"%p", playlist_CurrentPlayingItem(p_playlist)]];
- PL_UNLOCK;
-
- if ([self isItem: [o_playing_item pointerValue] inNode: [item pointerValue] checkItemExistence:YES locked:NO]
- || [o_playing_item isEqual: item])
- [cell setFont: [[NSFontManager sharedFontManager] convertFont:[cell font] toHaveTrait:NSBoldFontMask]];
+ NSFont *fontToUse;
+ if (config_GetInt(VLCIntf, "macosx-large-text"))
+ fontToUse = [NSFont systemFontOfSize:13.];
else
- [cell setFont: [[NSFontManager sharedFontManager] convertFont:[cell font] toNotHaveTrait:NSBoldFontMask]];
-}
-
-- (id)playingItem
-{
- playlist_t *p_playlist = pl_Get(VLCIntf);
-
- id o_playing_item;
+ fontToUse = [NSFont systemFontOfSize:11.];
+ BOOL b_is_playing = NO;
PL_LOCK;
- o_playing_item = [o_outline_dict objectForKey: [NSString stringWithFormat:@"%p", playlist_CurrentPlayingItem(p_playlist)]];
+ playlist_item_t *p_current_item = playlist_CurrentPlayingItem(p_playlist);
+ if (p_current_item) {
+ b_is_playing = p_current_item->i_id == [item plItemId];
+ }
PL_UNLOCK;
- return o_playing_item;
+ /*
+ TODO: repaint all items bold:
+ [self isItem: [o_playing_item pointerValue] inNode: [item pointerValue] checkItemExistence:YES locked:NO]
+ || [o_playing_item isEqual: item]
+ */
+
+ if (b_is_playing)
+ [cell setFont: [[NSFontManager sharedFontManager] convertFont:fontToUse toHaveTrait:NSBoldFontMask]];
+ else
+ [cell setFont: [[NSFontManager sharedFontManager] convertFont:fontToUse toNotHaveTrait:NSBoldFontMask]];
}
+// TODO remove method
- (NSArray *)draggedItems
{
- return [[o_nodes_array arrayByAddingObjectsFromArray: o_items_array] retain];
+ return [[self model] draggedItems];
}
- (void)setColumn: (NSString *)o_column state: (NSInteger)i_state translationDict:(NSDictionary *)o_dict
NSTableColumn * o_work_tc;
if (i_state == NSOnState) {
+ NSString *o_title = [o_dict objectForKey:o_column];
+ if (!o_title)
+ return;
+
o_work_tc = [[NSTableColumn alloc] initWithIdentifier: o_column];
[o_work_tc setEditable: NO];
[[o_work_tc dataCell] setFont: [NSFont controlContentFontOfSize:11.]];
}
else
[o_outline_view removeTableColumn: [o_outline_view tableColumnWithIdentifier: o_column]];
+
+ [o_outline_view setOutlineTableColumn: [o_outline_view tableColumnWithIdentifier:TITLE_COLUMN]];
}
- (void)saveTableColumns
NSUInteger count = [o_columns count];
NSTableColumn * o_currentColumn;
for (NSUInteger i = 0; i < count; i++) {
- o_currentColumn = [o_columns objectAtIndex: i];
- [o_arrayToSave addObject: [NSArray arrayWithObjects: [o_currentColumn identifier], [NSNumber numberWithFloat: [o_currentColumn width]], nil]];
+ o_currentColumn = [o_columns objectAtIndex:i];
+ [o_arrayToSave addObject:[NSArray arrayWithObjects:[o_currentColumn identifier], [NSNumber numberWithFloat:[o_currentColumn width]], nil]];
}
[[NSUserDefaults standardUserDefaults] setObject: o_arrayToSave forKey:@"PlaylistColumnSelection"];
[[NSUserDefaults standardUserDefaults] synchronize];
[o_arrayToSave release];
}
-@end
-
-@implementation VLCPlaylist (NSOutlineViewDataSource)
-
-- (id)outlineView:(NSOutlineView *)outlineView child:(NSInteger)index ofItem:(id)item
+- (BOOL)isValidResumeItem:(input_item_t *)p_item
{
- id o_value = [super outlineView: outlineView child: index ofItem: item];
+ char *psz_url = input_item_GetURI(p_item);
+ NSString *o_url_string = toNSStr(psz_url);
+ free(psz_url);
- [o_outline_dict setObject:o_value forKey:[NSString stringWithFormat:@"%p", [o_value pointerValue]]];
- return o_value;
-}
+ if ([o_url_string isEqualToString:@""])
+ return NO;
-/* Required for drag & drop and reordering */
-- (BOOL)outlineView:(NSOutlineView *)outlineView writeItems:(NSArray *)items toPasteboard:(NSPasteboard *)pboard
-{
- playlist_t *p_playlist = pl_Get(VLCIntf);
+ NSURL *o_url = [NSURL URLWithString:o_url_string];
- /* First remove the items that were moved during the last drag & drop
- operation */
- [o_items_array removeAllObjects];
- [o_nodes_array removeAllObjects];
+ if (![o_url isFileURL])
+ return NO;
- NSUInteger itemCount = [items count];
+ BOOL isDir = false;
+ if (![[NSFileManager defaultManager] fileExistsAtPath:[o_url path] isDirectory:&isDir])
+ return NO;
- for (NSUInteger i = 0 ; i < itemCount ; i++) {
- id o_item = [items objectAtIndex: i];
+ if (isDir)
+ return NO;
- /* Fill the items and nodes to move in 2 different arrays */
- if (((playlist_item_t *)[o_item pointerValue])->i_children > 0)
- [o_nodes_array addObject: o_item];
- else
- [o_items_array addObject: o_item];
- }
+ return YES;
+}
- /* Now we need to check if there are selected items that are in already
- selected nodes. In that case, we only want to move the nodes */
- [self removeItemsFrom: o_nodes_array ifChildrenOf: o_nodes_array];
- [self removeItemsFrom: o_items_array ifChildrenOf: o_nodes_array];
+- (void)updateAlertWindow:(NSTimer *)timer
+{
+ NSAlert *alert = [timer userInfo];
- /* We add the "VLCPlaylistItemPboardType" type to be able to recognize
- a Drop operation coming from the playlist. */
+ --currentResumeTimeout;
+ if (currentResumeTimeout <= 0) {
+ [[alert window] close];
+ [NSApp abortModal];
+ }
- [pboard declareTypes: [NSArray arrayWithObjects:
- @"VLCPlaylistItemPboardType", nil] owner: self];
- [pboard setData:[NSData data] forType:@"VLCPlaylistItemPboardType"];
+ NSString *buttonLabel = _NS("Restart playback");
+ buttonLabel = [buttonLabel stringByAppendingFormat:@" (%d)", currentResumeTimeout];
- return YES;
+ [[[alert buttons] objectAtIndex:2] setTitle:buttonLabel];
}
-- (NSDragOperation)outlineView:(NSOutlineView *)outlineView validateDrop:(id <NSDraggingInfo>)info proposedItem:(id)item proposedChildIndex:(NSInteger)index
+- (void)continuePlaybackWhereYouLeftOff:(input_thread_t *)p_input_thread
{
- playlist_t *p_playlist = pl_Get(VLCIntf);
- NSPasteboard *o_pasteboard = [info draggingPasteboard];
+ NSDictionary *recentlyPlayedFiles = [[NSUserDefaults standardUserDefaults] objectForKey:@"recentlyPlayedMedia"];
+ if (!recentlyPlayedFiles)
+ return;
- if (!p_playlist) return NSDragOperationNone;
+ input_item_t *p_item = input_GetItem(p_input_thread);
+ if (!p_item)
+ return;
- /* Dropping ON items is not allowed if item is not a node */
- if (item) {
- if (index == NSOutlineViewDropOnItemIndex &&
- ((playlist_item_t *)[item pointerValue])->i_children == -1) {
- return NSDragOperationNone;
- }
+ /* allow the user to over-write the start/stop/run-time */
+ if (var_GetFloat(p_input_thread, "run-time") > 0 ||
+ var_GetFloat(p_input_thread, "start-time") > 0 ||
+ var_GetFloat(p_input_thread, "stop-time") != 0) {
+ return;
}
- /* 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 locked: NO] ||
- (var_CreateGetBool(p_playlist, "media-library") && [self isItem: [item pointerValue] inNode: p_playlist->p_ml_category checkItemExistence: NO locked: NO])) || item == nil)) {
- return NSDragOperationNone;
- }
+ /* check for file existance before resuming */
+ if (![self isValidResumeItem:p_item])
+ return;
- /* Drop from the Playlist */
- if ([[o_pasteboard types] containsObject: @"VLCPlaylistItemPboardType"]) {
- NSUInteger count = [o_nodes_array count];
- for (NSUInteger i = 0 ; i < count ; i++) {
- /* We refuse to Drop in a child of an item we are moving */
- if ([self isItem: [item pointerValue] inNode: [[o_nodes_array objectAtIndex: i] pointerValue] checkItemExistence: NO locked:NO]) {
- return NSDragOperationNone;
- }
- }
- return NSDragOperationMove;
- }
- /* Drop from the Finder */
- else if ([[o_pasteboard types] containsObject: NSFilenamesPboardType]) {
- return NSDragOperationGeneric;
- }
- return NSDragOperationNone;
-}
+ char *psz_url = decode_URI(input_item_GetURI(p_item));
+ if (!psz_url)
+ return;
+ NSString *url = toNSStr(psz_url);
+ free(psz_url);
-- (BOOL)outlineView:(NSOutlineView *)outlineView acceptDrop:(id <NSDraggingInfo>)info item:(id)item childIndex:(NSInteger)index
-{
- playlist_t * p_playlist = pl_Get(VLCIntf);
- NSPasteboard *o_pasteboard = [info draggingPasteboard];
-
- /* Drag & Drop inside the playlist */
- if ([[o_pasteboard types] containsObject: @"VLCPlaylistItemPboardType"]) {
- if (index == -1) // this is no valid target, sanitize to top of table
- index = 0;
-
- int i_row = 0;
- playlist_item_t *p_new_parent, *p_item = NULL;
- NSArray *o_all_items = [o_nodes_array arrayByAddingObjectsFromArray: o_items_array];
- /* If the item is to be dropped as root item of the outline, make it a
- child of the respective general node, if is either the pl or the ml
- Else, choose the proposed parent as parent. */
- if (item == nil) {
- if ([self currentPlaylistRoot] == p_playlist->p_local_category || [self currentPlaylistRoot] == p_playlist->p_ml_category)
- p_new_parent = [self currentPlaylistRoot];
- else
- return NO;
- }
- else
- p_new_parent = [item pointerValue];
-
- /* Make sure the proposed parent is a node.
- (This should never be true) */
- if (p_new_parent->i_children < 0)
- return NO;
-
- NSUInteger count = [o_all_items count];
- if (count == 0)
- return NO;
-
- playlist_item_t **pp_items = (playlist_item_t **)calloc(count, sizeof(playlist_item_t*));
- if (!pp_items)
- return NO;
-
- PL_LOCK;
- NSUInteger j = 0;
- for (NSUInteger i = 0; i < count; i++) {
- p_item = [[o_all_items objectAtIndex:i] pointerValue];
- if (p_item)
- pp_items[j++] = p_item;
- }
+ NSNumber *lastPosition = [recentlyPlayedFiles objectForKey:url];
+ if (!lastPosition || lastPosition.intValue <= 0)
+ return;
- if (j == 0 || playlist_TreeMoveMany(p_playlist, j, pp_items, p_new_parent, index) != VLC_SUCCESS) {
- PL_UNLOCK;
- free(pp_items);
- return NO;
- }
+ int settingValue = config_GetInt(VLCIntf, "macosx-continue-playback");
+ if (settingValue == 2) // never resume
+ return;
- PL_UNLOCK;
- free(pp_items);
+ NSInteger returnValue = NSAlertErrorReturn;
+ if (settingValue == 0) { // ask
- [self playlistUpdated];
- i_row = [o_outline_view rowForItem:[o_outline_dict objectForKey:[NSString stringWithFormat: @"%p", [[o_all_items objectAtIndex: 0] pointerValue]]]];
+ char *psz_title_name = input_item_GetTitleFbName(p_item);
+ NSString *o_title = toNSStr(psz_title_name);
+ free(psz_title_name);
- if (i_row == -1)
- i_row = [o_outline_view rowForItem:[o_outline_dict objectForKey:[NSString stringWithFormat: @"%p", p_new_parent]]];
+ currentResumeTimeout = 6;
+ NSString *o_restartButtonLabel = _NS("Restart playback");
+ o_restartButtonLabel = [o_restartButtonLabel stringByAppendingFormat:@" (%d)", currentResumeTimeout];
+ NSAlert *theAlert = [NSAlert alertWithMessageText:_NS("Continue playback?") defaultButton:_NS("Continue") alternateButton:o_restartButtonLabel otherButton:_NS("Always continue") informativeTextWithFormat:_NS("Playback of \"%@\" will continue at %@"), o_title, [[VLCStringUtility sharedInstance] stringForTime:lastPosition.intValue]];
- [o_outline_view deselectAll: self];
- [o_outline_view selectRowIndexes:[NSIndexSet indexSetWithIndex:i_row] byExtendingSelection:NO];
- [o_outline_view scrollRowToVisible: i_row];
+ NSTimer *timer = [NSTimer timerWithTimeInterval:1
+ target:self
+ selector:@selector(updateAlertWindow:)
+ userInfo:theAlert
+ repeats:YES];
- return YES;
+ [[NSRunLoop currentRunLoop] addTimer:timer forMode:NSModalPanelRunLoopMode];
+
+ returnValue = [theAlert runModal];
+ [timer invalidate];
+
+ // restart button was pressed or timeout happened
+ if (returnValue == NSAlertAlternateReturn ||
+ returnValue == NSRunAbortedResponse)
+ return;
}
- else if ([[o_pasteboard types] containsObject: NSFilenamesPboardType]) {
- if ([self currentPlaylistRoot] != p_playlist->p_local_category && [self currentPlaylistRoot] != p_playlist->p_ml_category)
- return NO;
+ mtime_t lastPos = (mtime_t)lastPosition.intValue * 1000000;
+ msg_Dbg(VLCIntf, "continuing playback at %lld", lastPos);
+ var_SetTime(p_input_thread, "time", lastPos);
- playlist_item_t *p_node = [item pointerValue];
+ if (returnValue == NSAlertOtherReturn)
+ config_PutInt(VLCIntf, "macosx-continue-playback", 1);
+}
- NSArray *o_values = [[o_pasteboard propertyListForType: NSFilenamesPboardType]
- sortedArrayUsingSelector: @selector(caseInsensitiveCompare:)];
- NSUInteger count = [o_values count];
- NSMutableArray *o_array = [NSMutableArray arrayWithCapacity:count];
- input_thread_t * p_input = pl_CurrentInput(VLCIntf);
- BOOL b_returned = NO;
+- (void)storePlaybackPositionForItem:(input_thread_t *)p_input_thread
+{
+ if (!var_InheritBool(VLCIntf, "macosx-recentitems"))
+ return;
- if (count == 1 && p_input) {
- b_returned = input_AddSubtitle(p_input, vlc_path2uri([[o_values objectAtIndex:0] UTF8String], NULL), true);
- vlc_object_release(p_input);
- if (!b_returned)
- return YES;
- }
- else if (p_input)
- vlc_object_release(p_input);
+ input_item_t *p_item = input_GetItem(p_input_thread);
+ if (!p_item)
+ return;
+
+ if (![self isValidResumeItem:p_item])
+ return;
- for (NSUInteger i = 0; i < count; i++) {
- NSDictionary *o_dic;
- char *psz_uri = vlc_path2uri([[o_values objectAtIndex:i] UTF8String], NULL);
- if (!psz_uri)
- continue;
+ char *psz_url = decode_URI(input_item_GetURI(p_item));
+ if (!psz_url)
+ return;
+ NSString *url = toNSStr(psz_url);
+ free(psz_url);
- o_dic = [NSDictionary dictionaryWithObject:[NSString stringWithCString:psz_uri encoding:NSUTF8StringEncoding] forKey:@"ITEM_URL"];
+ NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+ NSMutableDictionary *mutDict = [[NSMutableDictionary alloc] initWithDictionary:[defaults objectForKey:@"recentlyPlayedMedia"]];
- free(psz_uri);
+ float relativePos = var_GetFloat(p_input_thread, "position");
+ mtime_t pos = var_GetTime(p_input_thread, "time") / 1000000;
+ mtime_t dur = input_item_GetDuration(p_item) / 1000000;
- [o_array addObject: o_dic];
- }
+ NSMutableArray *mediaList = [[defaults objectForKey:@"recentlyPlayedMediaList"] mutableCopy];
- if (item == nil)
- [self appendArray:o_array atPos:index enqueue: YES];
- else {
- assert(p_node->i_children != -1);
- [self appendNodeArray:o_array inNode: p_node atPos:index enqueue:YES];
+ if (relativePos > .05 && relativePos < .95 && dur > 180) {
+ [mutDict setObject:[NSNumber numberWithInt:pos] forKey:url];
+
+ [mediaList removeObject:url];
+ [mediaList addObject:url];
+ NSUInteger mediaListCount = mediaList.count;
+ if (mediaListCount > 30) {
+ for (NSUInteger x = 0; x < mediaListCount - 30; x++) {
+ [mutDict removeObjectForKey:[mediaList objectAtIndex:0]];
+ [mediaList removeObjectAtIndex:0];
+ }
}
- return YES;
+ } else {
+ [mutDict removeObjectForKey:url];
+ [mediaList removeObject:url];
}
- return NO;
+ [defaults setObject:mutDict forKey:@"recentlyPlayedMedia"];
+ [defaults setObject:mediaList forKey:@"recentlyPlayedMediaList"];
+ [defaults synchronize];
+
+ [mutDict release];
+ [mediaList release];
}
@end
projects / vlc / blobdiff