/*****************************************************************************
* playlist.m: MacOS X interface module
*****************************************************************************
-* Copyright (C) 2002-2008 the VideoLAN team
+* Copyright (C) 2002-2012 VLC authors and VideoLAN
* $Id$
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Derk-Jan Hartman <hartman at videola/n dot org>
* Benjamin Pracht <bigben at videolab dot org>
+ * Felix Paul Kühne <fkuehne at videolan dot org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
/* TODO
* add 'icons' for different types of nodes? (http://www.cocoadev.com/index.pl?IconAndTextInTableCell)
* reimplement enable/disable item
- * create a new 'tool' button (see the gear button in the Finder window) for 'actions'
- (adding service discovery, other views, new node/playlist, save node/playlist) stuff like that
*/
#include <string.h>
#include <math.h>
#include <sys/mount.h>
-#include <vlc_keys.h>
#import "intf.h"
#import "wizard.h"
#import "playlistinfo.h"
#import "playlist.h"
#import "controls.h"
-#import "vlc_osd.h"
#import "misc.h"
+#import "open.h"
+#import "MainMenu.h"
+
+#include <vlc_keys.h>
+#import <vlc_osd.h>
#import <vlc_interface.h>
-#import <vlc_services_discovery.h>
+
+#include <vlc_url.h>
/*****************************************************************************
* VLCPlaylistView implementation
- (NSMenu *)menuForEvent:(NSEvent *)o_event
{
- return( [[self delegate] menuForEvent: o_event] );
+ return( [(VLCPlaylist *)[self delegate] menuForEvent: o_event] );
}
- (void)keyDown:(NSEvent *)o_event
case NSDeleteFunctionKey:
case NSDeleteCharFunctionKey:
case NSBackspaceCharacter:
- [[self delegate] deleteItem:self];
+ [(VLCPlaylist *)[self delegate] deleteItem:self];
break;
case NSEnterCharacter:
case NSCarriageReturnCharacter:
- [(VLCPlaylist *)[[VLCMain sharedInstance] getPlaylist] playItem:self];
+ [(VLCPlaylist *)[[VLCMain sharedInstance] playlist] playItem:nil];
break;
default:
}
}
+- (BOOL)validateMenuItem:(NSMenuItem *)item
+{
+ if (([self numberOfSelectedRows] >= 1 && [item action] == @selector(delete:)) || [item action] == @selector(selectAll:))
+ return YES;
+
+ return NO;
+}
+
+- (BOOL) acceptsFirstResponder
+{
+ return YES;
+}
+
+- (BOOL) becomeFirstResponder
+{
+ [self setNeedsDisplay:YES];
+ return YES;
+}
+
+- (BOOL) resignFirstResponder
+{
+ [self setNeedsDisplay:YES];
+ return YES;
+}
+
+- (IBAction)delete:(id)sender
+{
+ [[[VLCMain sharedInstance] playlist] deleteItem: sender];
+}
+
@end
/*****************************************************************************
- (id)init
{
+ playlist_t * p_playlist = pl_Get( VLCIntf );
+ p_current_root_item = p_playlist->p_local_category;
+
self = [super init];
if ( self != nil )
{
}
return self;
}
+
- (void)awakeFromNib
{
- playlist_t * p_playlist = pl_Hold( VLCIntf );
+ 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]];
- vlc_object_release( p_playlist );
- [self initStrings];
+ [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)initStrings
+- (void)setPlaylistRoot: (playlist_item_t *)root_item
{
- [[o_tc_name headerCell] setStringValue:_NS("Name")];
- [[o_tc_author headerCell] setStringValue:_NS("Author")];
- [[o_tc_duration headerCell] setStringValue:_NS("Duration")];
+ 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
@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_Hold( VLCIntf );
- assert( outlineView == o_outline_view );
+ playlist_t * p_playlist = pl_Get( VLCIntf );
+ //assert( outlineView == o_outline_view );
+ PL_LOCK;
if( !item )
- p_item = p_playlist->p_root_category;
+ {
+ p_item = p_current_root_item;
+ }
else
p_item = (playlist_item_t *)[item pointerValue];
if( p_item )
i_return = p_item->i_children;
-
- pl_Release( VLCIntf );
+ PL_UNLOCK;
return i_return > 0 ? i_return : 0;
}
{
playlist_item_t *p_return = NULL, *p_item = NULL;
NSValue *o_value;
- playlist_t * p_playlist = pl_Hold( VLCIntf );
+ playlist_t * p_playlist = pl_Get( VLCIntf );
PL_LOCK;
if( item == nil )
{
/* root object */
- p_item = p_playlist->p_root_category;
+ p_item = p_current_root_item;
}
else
{
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 )
{
- /* Why is there a warning if that happens all the time and seems
- * to be normal? Add an assert and fix it.
+ /* 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];
}
- (BOOL)outlineView:(NSOutlineView *)outlineView isItemExpandable:(id)item
{
int i_return = 0;
- playlist_t *p_playlist = pl_Hold( VLCIntf );
+ playlist_t *p_playlist = pl_Get( VLCIntf );
+ PL_LOCK;
if( item == nil )
{
/* root object */
- if( p_playlist->p_root_category )
+ if( p_current_root_item )
{
- i_return = p_playlist->p_root_category->i_children;
+ i_return = p_current_root_item->i_children;
}
}
else
if( p_item )
i_return = p_item->i_children;
}
- pl_Release( VLCIntf );
+ PL_UNLOCK;
return (i_return >= 0);
}
- (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 */
}
return @"error" ;
}
-
+
p_item = (playlist_item_t *)[item pointerValue];
if( !p_item || !p_item->p_input )
{
}
return @"error";
}
-
+
attempted_reload = NO;
+ NSString * o_identifier = [o_tc identifier];
- if( [[o_tc identifier] isEqualToString:@"name"] )
+ 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_GetTitle( p_item->p_input );
- if( !EMPTY_STR( psz_title ) )
+ char *psz_title = input_item_GetTitleFbName( p_item->p_input );
+ if( psz_title )
{
o_value = [NSString stringWithUTF8String: psz_title];
+ free( psz_title );
}
- else
- {
- char *psz_name = input_item_GetName( p_item->p_input );
- if( psz_name )
- o_value = [NSString stringWithUTF8String: psz_name];
- free( psz_name );
- }
- free( psz_title );
}
- else if( [[o_tc identifier] isEqualToString:@"artist"] )
+ else if( [o_identifier isEqualToString:ARTIST_COLUMN] )
{
- char *psz_artist = input_item_GetArtist( p_item->p_input );
- if( psz_artist )
- o_value = [NSString stringWithUTF8String: psz_artist];
- free( psz_artist );
+ psz_value = input_item_GetArtist( p_item->p_input ); \
+ if (psz_value) { \
+ o_value = [NSString stringWithUTF8String: psz_value]; \
+ free( psz_value ); \
+ }
}
- else if( [[o_tc identifier] isEqualToString:@"duration"] )
+ else if( [o_identifier isEqualToString:@"duration"] )
{
char psz_duration[MSTRTIME_MAX_SIZE];
mtime_t dur = input_item_GetDuration( p_item->p_input );
else
o_value = @"--:--";
}
- else if( [[o_tc identifier] isEqualToString:@"status"] )
+ 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 = [NSImage imageWithWarningIcon];
+ o_value = [[NSWorkspace sharedWorkspace] iconForFileType:NSFileTypeForHFSTypeCode(kAlertCautionIcon)];
+ [o_value setSize: NSMakeSize(16,16)];
}
}
+
return o_value;
}
@end
/*****************************************************************************
- * extension to NSOutlineView's interface to fix compilation warnings
- * and let us access these 2 functions properly
- * this uses a private Apple-API, but works fine on all current OSX releases
- * keep checking for compatiblity with future releases though
+ * An extension to NSOutlineView's interface to fix compilation warnings
+ * and let us access these 2 functions properly.
+ * 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.
*****************************************************************************/
@interface NSOutlineView (UndocumentedSortImages)
*****************************************************************************/
@implementation VLCPlaylist
++ (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"];
+
+ [defaults registerDefaults:appDefaults];
+ [o_columnArray release];
+}
+
- (id)init
{
self = [super init];
- (void)awakeFromNib
{
- playlist_t * p_playlist = pl_Hold( VLCIntf );
+ playlist_t * p_playlist = pl_Get( VLCIntf );
int i;
[super awakeFromNib];
[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 setIntercellSpacing: NSMakeSize (0.0, 1.0)];
- /* This uses private Apple API which works fine until 10.5.
- * We need to keep checking in the future!
- * These methods are being added artificially to NSOutlineView's interface above */
+ [o_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. */
o_ascendingSortingImage = [[NSOutlineView class] _defaultTableHeaderSortImage];
o_descendingSortingImage = [[NSOutlineView class] _defaultTableHeaderReverseSortImage];
o_tc_sortColumn = nil;
- char ** ppsz_name;
- char ** ppsz_services = vlc_sd_GetNames( &ppsz_name );
- if( !ppsz_services )
+ NSArray * o_columnArray = [[NSUserDefaults standardUserDefaults] arrayForKey:@"PlaylistColumnSelection"];
+ NSUInteger count = [o_columnArray count];
+
+ id o_menu = [[VLCMain sharedInstance] mainMenu];
+ NSString * o_column;
+
+ NSMenu *o_context_menu = [o_menu setupPlaylistTableColumnsMenu];
+ [o_playlist_header setMenu: o_context_menu];
+
+ for (NSUInteger i = 0; i < count; i++)
{
- vlc_object_release( p_playlist );
- return;
+ o_column = [[o_columnArray objectAtIndex:i] objectAtIndex:0];
+ if ([o_column isEqualToString:@"status"])
+ continue;
+
+ [self setColumn: o_column state: NSOnState];
+ [o_menu setPlaylistColumnTableState: NSOnState forColumn: o_column];
+ [[o_outline_view tableColumnWithIdentifier: o_column] setWidth: [[[o_columnArray objectAtIndex:i] objectAtIndex:1] floatValue]];
}
-
- for( i = 0; ppsz_services[i]; i++ )
- {
- bool b_enabled;
- NSMenuItem *o_lmi;
-
- char * name = ppsz_name[i] ? ppsz_name[i] : ppsz_services[i];
- /* Check whether to enable these menuitems */
- b_enabled = playlist_IsServicesDiscoveryLoaded( p_playlist, ppsz_services[i] );
-
- /* Create the menu entries used in the playlist menu */
- o_lmi = [[o_mi_services submenu] addItemWithTitle:
- [NSString stringWithUTF8String: name]
- action: @selector(servicesChange:)
- keyEquivalent: @""];
- [o_lmi setTarget: self];
- [o_lmi setRepresentedObject: [NSString stringWithUTF8String: ppsz_services[i]]];
- if( b_enabled ) [o_lmi setState: NSOnState];
-
- /* Create the menu entries for the main menu */
- o_lmi = [[o_mm_mi_services submenu] addItemWithTitle:
- [NSString stringWithUTF8String: name]
- action: @selector(servicesChange:)
- keyEquivalent: @""];
- [o_lmi setTarget: self];
- [o_lmi setRepresentedObject: [NSString stringWithUTF8String: ppsz_services[i]]];
- if( b_enabled ) [o_lmi setState: NSOnState];
-
- free( ppsz_services[i] );
- free( ppsz_name[i] );
- }
- free( ppsz_services );
- free( ppsz_name );
-
- vlc_object_release( p_playlist );
+
+ [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(applicationWillTerminate:) name: NSApplicationWillTerminateNotification object: nil];
+}
+
+- (void)applicationWillTerminate:(NSNotification *)notification
+{
+ /* let's make sure we save the correct widths and positions, since this likely changed since the last time the user played with the column selection */
+ [self saveTableColumns];
}
- (void)searchfieldChanged:(NSNotification *)o_notification
- (void)initStrings
{
- [super initStrings];
-
[o_mi_save_playlist setTitle: _NS("Save Playlist...")];
[o_mi_play setTitle: _NS("Play")];
[o_mi_delete setTitle: _NS("Delete")];
[[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")];
- [o_mi_addNode setTitle: _NS("Add Folder to 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 */
- for( unsigned int i = 0 ; i < [[o_outline_view tableColumns] count] ; i++ )
+ 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 setIndicatorImage:nil inTableColumn: [[o_outline_view tableColumns] objectAtIndex:i]];
}
[o_outline_view setHighlightedTableColumn:nil];
// 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];
-
- playlist_t *p_playlist = pl_Hold( VLCIntf );
-
- PL_LOCK;
- if( playlist_CurrentSize( p_playlist ) >= 2 )
- {
- [o_status_field setStringValue: [NSString stringWithFormat:
- _NS("%i items"),
- playlist_CurrentSize( p_playlist )]];
- }
- else
- {
- if( playlist_IsEmpty( p_playlist ) )
- [o_status_field setStringValue: _NS("No items in the playlist")];
- else
- [o_status_field setStringValue: _NS("1 item")];
- }
- PL_UNLOCK;
- vlc_object_release( p_playlist );
+ [[[[VLCMain sharedInstance] wizard] playlistWizard] reloadOutlineView];
+ [[[[VLCMain sharedInstance] bookmarks] dataTable] reloadData];
[self outlineViewSelectionDidChange: nil];
-}
-
-- (void)playModeUpdated
-{
- 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];
- else if( loop )
- [[[VLCMain sharedInstance] getControls] repeatAll];
- else
- [[[VLCMain sharedInstance] getControls] repeatOff];
-
- [[[VLCMain sharedInstance] getControls] shuffle];
-
- vlc_object_release( p_playlist );
+ [[VLCMain sharedInstance] updateMainWindow];
}
- (void)outlineViewSelectionDidChange:(NSNotification *)notification
/* 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];
- return;
}
+ free( psz_uri );
}
- [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] getInfo] updatePanelWithItem:p_item->p_input];
- }
+ /* update our info-panel to reflect the new item */
+ [[[VLCMain sharedInstance] info] updatePanelWithItem:p_item->p_input];
}
}
- (void)updateRowSelection
{
- int i_row;
- unsigned int j;
-
// FIXME: unsafe
- playlist_t *p_playlist = pl_Hold( VLCIntf );
+ 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 );
- PL_UNLOCK;
if( p_item == NULL )
{
- pl_Release( VLCIntf );
+ PL_UNLOCK;
return;
}
[o_array insertObject: [NSValue valueWithPointer: p_temp_item] atIndex: 0];
p_temp_item = p_temp_item->p_parent;
}
+ PL_UNLOCK;
- for( j = 0; j < [o_array count] - 1; j++ )
+ NSUInteger count = [o_array count];
+ for( NSUInteger j = 0; j < count - 1; j++ )
{
id o_item;
if( ( o_item = [o_outline_dict objectForKey:
{
[o_outline_view expandItem: o_item];
}
-
}
- pl_Release( VLCIntf );
+ 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
locked:(BOOL)b_locked
{
- playlist_t * p_playlist = pl_Hold( VLCIntf );
+ playlist_t * p_playlist = pl_Get( VLCIntf );
playlist_item_t *p_temp_item = p_item;
if( p_node == p_item )
- {
- vlc_object_release(p_playlist);
return YES;
- }
if( p_node->i_children < 1)
- {
- vlc_object_release(p_playlist);
return NO;
- }
if ( p_temp_item )
{
else if ( i == p_playlist->all_items.i_size - 1 )
{
if(!b_locked) PL_UNLOCK;
- vlc_object_release( p_playlist );
return NO;
}
}
if( p_temp_item == p_node )
{
if(!b_locked) PL_UNLOCK;
- vlc_object_release( p_playlist );
return YES;
}
}
if(!b_locked) PL_UNLOCK;
}
-
- vlc_object_release( p_playlist );
return NO;
}
inNode: (playlist_item_t *)p_node
checkItemExistence:(BOOL)b_check
{
- [self isItem:p_item inNode:p_node checkItemExistence:b_check locked:NO];
+ return [self isItem:p_item inNode:p_node checkItemExistence:b_check locked:NO];
}
-/* This method is usefull for instance to remove the selected children of an
+/* 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
{
- unsigned int i, j;
- for( i = 0 ; i < [o_items count] ; i++ )
+ NSUInteger itemCount = [o_items count];
+ NSUInteger nodeCount = [o_nodes count];
+ for( NSUInteger i = 0 ; i < itemCount ; i++ )
{
- for ( j = 0 ; j < [o_nodes count] ; j++ )
+ for ( NSUInteger j = 0 ; j < nodeCount ; j++ )
{
if( o_items == o_nodes)
{
- (IBAction)savePlaylist:(id)sender
{
- playlist_t * p_playlist = pl_Hold( VLCIntf );
+ playlist_t * p_playlist = pl_Get( VLCIntf );
NSSavePanel *o_save_panel = [NSSavePanel savePanel];
NSString * o_name = [NSString stringWithFormat: @"%@", _NS("Untitled")];
- //[o_save_panel setAllowedFileTypes: [NSArray arrayWithObjects: @"m3u", @"xpf", nil] ];
[o_save_panel setTitle: _NS("Save Playlist")];
[o_save_panel setPrompt: _NS("Save")];
[o_save_panel setAccessoryView: o_save_accessory_view];
if( [o_save_panel runModalForDirectory: nil
file: o_name] == NSOKButton )
{
- NSString *o_filename = [o_save_panel filename];
+ NSString *o_filename = [[o_save_panel URL] path];
- if( [o_save_accessory_popup indexOfSelectedItem] == 1 )
+ if( [o_save_accessory_popup indexOfSelectedItem] == 0 )
+ {
+ NSString * o_real_filename;
+ NSRange range;
+ range.location = [o_filename length] - [@".m3u" length];
+ range.length = [@".m3u" length];
+
+ if( [o_filename compare:@".m3u" options: NSCaseInsensitiveSearch
+ range: range] != NSOrderedSame )
+ {
+ o_real_filename = [NSString stringWithFormat: @"%@.m3u", o_filename];
+ }
+ else
+ {
+ o_real_filename = o_filename;
+ }
+ playlist_Export( p_playlist,
+ [o_real_filename fileSystemRepresentation],
+ p_playlist->p_local_category, "export-m3u" );
+ }
+ else if( [o_save_accessory_popup indexOfSelectedItem] == 1 )
{
NSString * o_real_filename;
NSRange range;
{
NSString * o_real_filename;
NSRange range;
- range.location = [o_filename length] - [@".m3u" length];
- range.length = [@".m3u" length];
+ range.location = [o_filename length] - [@".html" length];
+ range.length = [@".html" length];
- if( [o_filename compare:@".m3u" options: NSCaseInsensitiveSearch
+ if( [o_filename compare:@".html" options: NSCaseInsensitiveSearch
range: range] != NSOrderedSame )
{
- o_real_filename = [NSString stringWithFormat: @"%@.m3u", o_filename];
+ o_real_filename = [NSString stringWithFormat: @"%@.html", o_filename];
}
else
{
}
playlist_Export( p_playlist,
[o_real_filename fileSystemRepresentation],
- p_playlist->p_local_category, "export-m3u" );
+ p_playlist->p_local_category, "export-html" );
}
}
- vlc_object_release( p_playlist );
}
/* 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_Hold( p_intf );
+ playlist_t * p_playlist = pl_Get( p_intf );
playlist_item_t *p_item;
playlist_item_t *p_node = NULL;
+ // ignore clicks on column header when handling double action
+ if( sender != nil && [o_outline_view clickedRow] == -1 && sender != o_mi_play)
+ return;
+
p_item = [[o_outline_view itemAtRow:[o_outline_view selectedRow]] pointerValue];
+ PL_LOCK;
if( p_item )
{
if( p_item->i_children == -1 )
{
p_node = p_item->p_parent;
-
}
else
{
p_item = NULL;
}
}
- playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, pl_Unlocked, p_node, p_item );
+ playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, pl_Locked, p_node, p_item );
}
- vlc_object_release( p_playlist );
+ PL_UNLOCK;
}
- (IBAction)revealItemInFinder:(id)sender
{
- playlist_item_t * p_item = [[o_outline_view itemAtRow:[o_outline_view selectedRow]] pointerValue];
- NSMutableString * o_mrl = nil;
+ NSIndexSet * selectedRows = [o_outline_view selectedRowIndexes];
+ NSUInteger count = [selectedRows count];
+ NSUInteger indexes[count];
+ [selectedRows getIndexes:indexes maxCount:count inIndexRange: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];
-}
+ 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;
+
+ o_mrl = [[NSMutableString alloc] initWithFormat: @"%s", decode_URI( input_item_GetURI( p_item->p_input ))];
+
+ /* 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];
+
+ if( [o_mrl characterAtIndex:0] == '/' )
+ [[NSWorkspace sharedWorkspace] selectFile: o_mrl inFileViewerRootedAtPath: o_mrl];
+ }
+
+ [o_mrl release];
+ }
+}
/* When called retrieves the selected outlineview row and plays that node or item */
- (IBAction)preparseItem:(id)sender
{
int i_count;
- NSMutableArray *o_to_preparse;
+ NSIndexSet *o_selected_indexes;
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_t * p_playlist = pl_Get( p_intf );
playlist_item_t *p_item = NULL;
- for( i = 0; i < i_count; i++ )
+ o_selected_indexes = [o_outline_view selectedRowIndexes];
+ i_count = [o_selected_indexes count];
+
+ NSUInteger indexes[i_count];
+ [o_selected_indexes getIndexes:indexes maxCount:i_count inIndexRange:nil];
+ for (int 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];
+ p_item = [[o_outline_view itemAtRow:indexes[i]] pointerValue];
+ [o_outline_view deselectRow: indexes[i]];
if( p_item )
{
if( p_item->i_children == -1 )
- {
- playlist_PreparseEnqueue( p_playlist, p_item->p_input, pl_Unlocked );
- }
+ playlist_PreparseEnqueue( p_playlist, p_item->p_input );
else
- {
msg_Dbg( p_intf, "preparsing nodes not implemented" );
- }
}
}
- vlc_object_release( p_playlist );
[self playlistUpdated];
}
- (IBAction)downloadCoverArt:(id)sender
{
int i_count;
- NSMutableArray *o_to_preparse;
+ NSIndexSet *o_selected_indexes;
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_t * p_playlist = pl_Get( p_intf );
playlist_item_t *p_item = NULL;
- for( i = 0; i < i_count; i++ )
+ o_selected_indexes = [o_outline_view selectedRowIndexes];
+ i_count = [o_selected_indexes count];
+
+ NSUInteger indexes[i_count];
+ [o_selected_indexes getIndexes:indexes maxCount:i_count inIndexRange:nil];
+ for (int 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];
+ p_item = [[o_outline_view itemAtRow: indexes[i]] pointerValue];
if( p_item && p_item->i_children == -1 )
- {
- playlist_AskForArtEnqueue( p_playlist, p_item->p_input, pl_Unlocked );
- }
+ playlist_AskForArtEnqueue( p_playlist, p_item->p_input );
}
- 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_Hold( VLCIntf );
- if( !playlist_IsServicesDiscoveryLoaded( p_playlist, [o_string UTF8String] ) )
- playlist_ServicesDiscoveryAdd( p_playlist, [o_string UTF8String] );
- else
- playlist_ServicesDiscoveryRemove( p_playlist, [o_string UTF8String] );
-
- [o_mi setState: playlist_IsServicesDiscoveryLoaded( p_playlist,
- [o_string UTF8String] ) ? YES : NO];
-
- vlc_object_release( p_playlist );
[self playlistUpdated];
- return;
}
- (IBAction)selectAll:(id)sender
- (IBAction)deleteItem:(id)sender
{
- int i_count, i_row;
- NSMutableArray *o_to_delete;
- NSNumber *o_number;
-
+ int i_count;
+ NSIndexSet *o_selected_indexes;
playlist_t * p_playlist;
intf_thread_t * p_intf = VLCIntf;
- o_to_delete = [NSMutableArray arrayWithArray:[[o_outline_view selectedRowEnumerator] allObjects]];
- i_count = [o_to_delete count];
+ o_selected_indexes = [o_outline_view selectedRowIndexes];
+ i_count = [o_selected_indexes count];
- p_playlist = pl_Hold( p_intf );
+ p_playlist = pl_Get( p_intf );
- PL_LOCK;
- for( int i = 0; i < i_count; i++ )
+ NSUInteger indexes[i_count];
+ if (i_count == [o_outline_view numberOfRows])
{
- o_number = [o_to_delete lastObject];
- i_row = [o_number intValue];
- id o_item = [o_outline_view itemAtRow: i_row];
+#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];
+ 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];
#ifndef NDEBUG
- msg_Dbg( p_intf, "deleting item %i (of %i) with id \"%i\", pointerValue \"%p\" and %i children", i+1, i_count,
+ msg_Dbg( p_intf, "deleting item %i (of %i) with id \"%i\", pointerValue \"%p\" and %i children", i+1, i_count,
p_item->p_input->i_id, [o_item pointerValue], p_item->i_children +1 );
#endif
- [o_to_delete removeObject: o_number];
- [o_outline_view deselectRow: i_row];
if( 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])
+ [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 );
+
+ playlist_NodeDelete( p_playlist, p_item, true, false );
}
else
- playlist_DeleteFromInput( p_playlist, p_item->p_input->i_id, pl_Locked );
+ playlist_DeleteFromInput( p_playlist, p_item->p_input, pl_Locked );
+
+ PL_UNLOCK;
+ [o_outline_dict removeObjectForKey:[NSString stringWithFormat:@"%p", [o_item pointerValue]]];
+ [o_item release];
}
- PL_UNLOCK;
[self playlistUpdated];
- vlc_object_release( p_playlist );
}
- (IBAction)sortNodeByName:(id)sender
- (void)sortNode:(int)i_mode
{
- playlist_t * p_playlist = pl_Hold( VLCIntf );
+ playlist_t * p_playlist = pl_Get( VLCIntf );
playlist_item_t * p_item;
if( [o_outline_view selectedRow] > -1 )
else
/*If no item is selected, sort the whole playlist*/
{
- p_item = p_playlist->p_root_category;
+ p_item = [self currentPlaylistRoot];
}
+ PL_LOCK;
if( p_item->i_children > -1 ) // the item is a node
{
- PL_LOCK;
playlist_RecursiveNodeSort( p_playlist, p_item, i_mode, ORDER_NORMAL );
- PL_UNLOCK;
}
else
{
- PL_LOCK;
playlist_RecursiveNodeSort( p_playlist,
p_item->p_parent, i_mode, ORDER_NORMAL );
- PL_UNLOCK;
}
- vlc_object_release( p_playlist );
+ PL_UNLOCK;
[self playlistUpdated];
}
- (input_item_t *)createItem:(NSDictionary *)o_one_item
{
intf_thread_t * p_intf = VLCIntf;
- playlist_t * p_playlist = pl_Hold( p_intf );
+ playlist_t * p_playlist = pl_Get( p_intf );
input_item_t *p_input;
- int i;
- BOOL b_rem = FALSE, b_dir = FALSE;
- NSString *o_uri, *o_name;
+ BOOL b_rem = FALSE, b_dir = FALSE, b_writable = FALSE;
+ NSString *o_uri, *o_name, *o_path;
+ NSURL * o_nsurl;
NSArray *o_options;
NSURL *o_true_file;
/* Get the item */
o_uri = (NSString *)[o_one_item objectForKey: @"ITEM_URL"];
+ o_nsurl = [NSURL URLWithString: o_uri];
+ o_path = [o_nsurl path];
o_name = (NSString *)[o_one_item objectForKey: @"ITEM_NAME"];
o_options = (NSArray *)[o_one_item objectForKey: @"ITEM_OPTIONS"];
- /* Find the name for a disc entry (i know, can you believe the trouble?) */
- if( ( !o_name || [o_name isEqualToString:@""] ) && [o_uri rangeOfString: @"/dev/"].location != NSNotFound )
+ 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] )
{
- int i_count, i_index;
- struct statfs *mounts = NULL;
- i_count = getmntinfo (&mounts, MNT_NOWAIT);
- /* getmntinfo returns a pointer to static data. Do not free. */
- for( i_index = 0 ; i_index < i_count; i_index++ )
+ id o_vlc_open = [[VLCMain sharedInstance] open];
+
+ char *diskType = [o_vlc_open getVolumeTypeFromMountPath: o_path];
+ msg_Dbg( p_intf, "detected optical media of type '%s' in the file input", diskType );
+
+ if (diskType == kVLCMediaDVD)
{
- NSMutableString *o_temp, *o_temp2;
- o_temp = [NSMutableString stringWithString: o_uri];
- o_temp2 = [NSMutableString stringWithUTF8String: mounts[i_index].f_mntfromname];
- [o_temp replaceOccurrencesOfString: @"/dev/rdisk" withString: @"/dev/disk" options:NSLiteralSearch range:NSMakeRange(0, [o_temp length]) ];
- [o_temp2 replaceOccurrencesOfString: @"s0" withString: @"" options:NSLiteralSearch range:NSMakeRange(0, [o_temp2 length]) ];
- [o_temp2 replaceOccurrencesOfString: @"s1" withString: @"" options:NSLiteralSearch range:NSMakeRange(0, [o_temp2 length]) ];
-
- if( strstr( [o_temp fileSystemRepresentation], [o_temp2 fileSystemRepresentation] ) != NULL )
- {
- o_name = [[NSFileManager defaultManager] displayNameAtPath: [NSString stringWithUTF8String:mounts[i_index].f_mntonname]];
- }
+ o_uri = [NSString stringWithFormat: @"dvdnav://%@", [o_vlc_open getBSDNodeFromMountPath: o_path]];
+ }
+ else if (diskType == kVLCMediaVideoTSFolder)
+ {
+ o_uri = [NSString stringWithFormat: @"dvdnav://%@", o_path];
+ }
+ else if (diskType == kVLCMediaAudioCD)
+ {
+ o_uri = [NSString stringWithFormat: @"cdda://%@", [o_vlc_open getBSDNodeFromMountPath: o_path]];
+ }
+ else if (diskType == kVLCMediaVCD)
+ {
+ o_uri = [NSString stringWithFormat: @"vcd://%@#0:0", [o_vlc_open getBSDNodeFromMountPath: o_path]];
+ }
+ else if (diskType == kVLCMediaSVCD)
+ {
+ o_uri = [NSString stringWithFormat: @"vcd://%@@0:0", [o_vlc_open getBSDNodeFromMountPath: o_path]];
+ }
+ else if (diskType == kVLCMediaBD || diskType == kVLCMediaBDMVFolder)
+ {
+ o_uri = [NSString stringWithFormat: @"bluray://%@", o_path];
+ }
+ else
+ {
+ msg_Warn( VLCIntf, "unknown disk type, treating %s as regular input", [o_path UTF8String] );
}
+
+ p_input = input_item_New( [o_uri UTF8String], [[[NSFileManager defaultManager] displayNameAtPath: o_path] UTF8String] );
}
- /* If no name, then make a guess */
- if( !o_name) o_name = [[NSFileManager defaultManager] displayNameAtPath: o_uri];
+ else
+ p_input = input_item_New( [o_uri fileSystemRepresentation], o_name ? [o_name UTF8String] : NULL );
- if( [[NSFileManager defaultManager] fileExistsAtPath:o_uri isDirectory:&b_dir] && b_dir &&
- [[NSWorkspace sharedWorkspace] getFileSystemInfoForPath: o_uri isRemovable: &b_rem
- isWritable:NULL isUnmountable:NULL description:NULL type:NULL] && b_rem )
- {
- /* All of this is to make sure CD's play when you D&D them on VLC */
- /* Converts mountpoint to a /dev file */
- struct statfs *buf;
- char *psz_dev;
- NSMutableString *o_temp;
-
- buf = (struct statfs *) malloc (sizeof(struct statfs));
- statfs( [o_uri fileSystemRepresentation], buf );
- psz_dev = strdup(buf->f_mntfromname);
- o_temp = [NSMutableString stringWithUTF8String: psz_dev ];
- [o_temp replaceOccurrencesOfString: @"/dev/disk" withString: @"/dev/rdisk" options:NSLiteralSearch range:NSMakeRange(0, [o_temp length]) ];
- [o_temp replaceOccurrencesOfString: @"s0" withString: @"" options:NSLiteralSearch range:NSMakeRange(0, [o_temp length]) ];
- [o_temp replaceOccurrencesOfString: @"s1" withString: @"" options:NSLiteralSearch range:NSMakeRange(0, [o_temp length]) ];
- o_uri = o_temp;
- }
-
- p_input = input_item_New( p_playlist, [o_uri fileSystemRepresentation], [o_name UTF8String] );
if( !p_input )
- return NULL;
+ return NULL;
if( o_options )
{
- for( i = 0; i < (int)[o_options count]; i++ )
+ NSUInteger count = [o_options count];
+ for( NSUInteger i = 0; i < count; i++ )
{
- input_item_AddOption( p_input, strdup( [[o_options objectAtIndex:i] UTF8String] ),
+ input_item_AddOption( p_input, [[o_options objectAtIndex:i] UTF8String],
VLC_INPUT_OPTION_TRUSTED );
}
}
/* Recent documents menu */
- o_true_file = [NSURL fileURLWithPath: o_uri];
- if( o_true_file != nil && (BOOL)config_GetInt( p_playlist, "macosx-recentitems" ) == YES )
+ if( o_nsurl != nil && (BOOL)config_GetInt( p_playlist, "macosx-recentitems" ) == YES )
{
- [[NSDocumentController sharedDocumentController]
- noteNewRecentDocumentURL: o_true_file];
+ [[NSDocumentController sharedDocumentController] noteNewRecentDocumentURL: o_nsurl];
}
-
- vlc_object_release( p_playlist );
return p_input;
}
- (void)appendArray:(NSArray*)o_array atPos:(int)i_position enqueue:(BOOL)b_enqueue
{
- int i_item;
- playlist_t * p_playlist = pl_Hold( VLCIntf );
+ 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( i_item = 0; i_item < (int)[o_array count]; i_item++ )
+ for( NSUInteger i_item = 0; i_item < count; i_item++ )
{
input_item_t *p_input;
NSDictionary *o_one_item;
/* Add the item */
/* FIXME: playlist_AddInput() can fail */
-
- playlist_AddInput( p_playlist, p_input, PLAYLIST_INSERT,
- i_position == -1 ? PLAYLIST_END : i_position + i_item, true,
+
+ playlist_AddInput( p_playlist, p_input, PLAYLIST_INSERT, i_position == -1 ? PLAYLIST_END : i_position + i_item, b_usingPlaylist,
pl_Locked );
if( i_item == 0 && !b_enqueue )
{
- playlist_item_t *p_item = NULL;
- playlist_item_t *p_node = NULL;
- p_item = playlist_ItemGetByInput( p_playlist, p_input );
- if( p_item )
- {
- if( p_item->i_children == -1 )
- p_node = p_item->p_parent;
- else
- {
- p_node = p_item;
- if( p_node->i_children > 0 && p_node->pp_children[0]->i_children == -1 )
- p_item = p_node->pp_children[0];
- else
- p_item = NULL;
- }
- playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, pl_Locked, p_node, p_item );
- }
+ 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 );
}
+
vlc_gc_decref( p_input );
}
PL_UNLOCK;
-
[self playlistUpdated];
- vlc_object_release( p_playlist );
}
- (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_Hold( VLCIntf );
+ playlist_t * p_playlist = pl_Get( VLCIntf );
+ NSUInteger count = [o_array count];
- for( i_item = 0; i_item < (int)[o_array count]; i_item++ )
+ for( NSUInteger i_item = 0; i_item < count; i_item++ )
{
input_item_t *p_input;
NSDictionary *o_one_item;
if( !p_input ) continue;
/* Add the item */
- /* FIXME: playlist_BothAddInput() can fail */
PL_LOCK;
- playlist_BothAddInput( p_playlist, p_input, p_node,
+ playlist_NodeAddInput( p_playlist, p_input, p_node,
PLAYLIST_INSERT,
i_position == -1 ?
PLAYLIST_END : i_position + i_item,
- NULL, NULL, pl_Locked );
+ pl_Locked );
if( i_item == 0 && !b_enqueue )
vlc_gc_decref( p_input );
}
[self playlistUpdated];
- vlc_object_release( p_playlist );
}
- (NSMutableArray *)subSearchItem:(playlist_item_t *)p_item
{
- playlist_t *p_playlist = pl_Hold( VLCIntf );
+ playlist_t *p_playlist = pl_Get( VLCIntf );
playlist_item_t *p_selected_item;
- int i_current, i_selected_row;
+ 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];
+ p_selected_item = (playlist_item_t *)[[o_outline_view itemAtRow: i_selected_row] pointerValue];
- for( i_current = 0; i_current < p_item->i_children ; i_current++ )
+ for( NSUInteger i_current = 0; i_current < p_item->i_children ; i_current++ )
{
char *psz_temp;
NSString *o_current_name, *o_current_author;
else if( p_selected_item == p_item->pp_children[i_current] &&
b_selected_item_met == YES )
{
- vlc_object_release( p_playlist );
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 );
/*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 );
[o_result insertObject: [NSValue valueWithPointer:
p_item->pp_children[i_current]] atIndex:0];
return o_result;
}
}
}
- vlc_object_release( p_playlist );
return NULL;
}
- (IBAction)searchItem:(id)sender
{
- playlist_t * p_playlist = pl_Hold( VLCIntf );
+ playlist_t * p_playlist = pl_Get( VLCIntf );
id o_result;
- unsigned int i;
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:p_playlist->p_root_category];
+ o_result = [self subSearchItem:[self currentPlaylistRoot]];
if( o_result == NULL )
{
/* If the first search failed, search again from the beginning */
- o_result = [self subSearchItem:p_playlist->p_root_category];
+ 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;
+ if( [[o_result objectAtIndex: 0] pointerValue] == p_playlist->p_local_category )
+ i_start = 1;
else
- i_start = 0;
+ i_start = 0;
+ NSUInteger count = [o_result count];
- for( i = i_start ; i < [o_result count] - 1 ; i++ )
+ for( NSUInteger i = i_start ; i < count - 1 ; i++ )
{
[o_outline_view expandItem: [o_outline_dict objectForKey:
[NSString stringWithFormat: @"%p",
}
i_row = [o_outline_view rowForItem: [o_outline_dict objectForKey:
[NSString stringWithFormat: @"%p",
- [[o_result objectAtIndex: [o_result count] - 1 ]
+ [[o_result objectAtIndex: count - 1 ]
pointerValue]]]];
}
if( i_row > -1 )
{
- [o_outline_view selectRow:i_row byExtendingSelection: NO];
+ [o_outline_view selectRowIndexes:[NSIndexSet indexSetWithIndex:i_row] byExtendingSelection:NO];
[o_outline_view scrollRowToVisible: i_row];
}
- vlc_object_release( p_playlist );
}
- (IBAction)recursiveExpandNode:(id)sender
{
- id o_item = [o_outline_view itemAtRow: [o_outline_view selectedRow]];
- playlist_item_t *p_item = (playlist_item_t *)[o_item pointerValue];
+ NSIndexSet * selectedRows = [o_outline_view selectedRowIndexes];
+ NSUInteger count = [selectedRows count];
+ NSUInteger indexes[count];
+ [selectedRows getIndexes:indexes maxCount:count inIndexRange:nil];
- 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]];
- }
+ id o_item;
+ 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];
- /* 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];
+ selectedRows = [o_outline_view selectedRowIndexes];
+ [selectedRows getIndexes:indexes maxCount:count inIndexRange:nil];
+ }
}
- (NSMenu *)menuForEvent:(NSEvent *)o_event
bool b_rows;
bool b_item_sel;
- pt = [o_outline_view convertPoint: [o_event locationInWindow]
- fromView: nil];
+ pt = [o_outline_view convertPoint: [o_event locationInWindow] fromView: nil];
int row = [o_outline_view rowAtPoint:pt];
- if( row != -1 )
+ if( row != -1 && ![[o_outline_view selectedRowIndexes] containsIndex: row] )
[o_outline_view selectRowIndexes:[NSIndexSet indexSetWithIndex:row] byExtendingSelection:NO];
b_item_sel = ( row != -1 && [o_outline_view selectedRow] != -1 );
return( o_ctx_menu );
}
-- (void)outlineView: (NSOutlineView *)o_tv
- didClickTableColumn:(NSTableColumn *)o_tc
+- (void)outlineView: (NSOutlineView *)o_tv didClickTableColumn:(NSTableColumn *)o_tc
{
int i_mode, i_type = 0;
intf_thread_t *p_intf = VLCIntf;
+ NSString * o_identifier = [o_tc identifier];
- playlist_t *p_playlist = pl_Hold( p_intf );
+ playlist_t *p_playlist = pl_Get( 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 );
+ 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
- {
b_isSortDescending = false;
- }
-
- if( o_tc == o_tc_name )
- {
- i_mode = SORT_TITLE;
- }
- else if( o_tc == o_tc_author )
- {
- i_mode = SORT_ARTIST;
- }
if( b_isSortDescending )
- {
i_type = ORDER_REVERSE;
- }
else
- {
i_type = ORDER_NORMAL;
- }
PL_LOCK;
- playlist_RecursiveNodeSort( p_playlist, p_playlist->p_root_category, i_mode, i_type );
+ playlist_RecursiveNodeSort( p_playlist, [self currentPlaylistRoot], i_mode, i_type );
PL_UNLOCK;
- vlc_object_release( p_playlist );
[self playlistUpdated];
o_tc_sortColumn = o_tc;
[o_outline_view setHighlightedTableColumn:o_tc];
if( b_isSortDescending )
- {
- [o_outline_view setIndicatorImage:o_descendingSortingImage
- inTableColumn:o_tc];
- }
+ [o_outline_view setIndicatorImage:o_descendingSortingImage inTableColumn:o_tc];
else
- {
- [o_outline_view setIndicatorImage:o_ascendingSortingImage
- inTableColumn:o_tc];
- }
+ [o_outline_view setIndicatorImage:o_ascendingSortingImage inTableColumn:o_tc];
}
forTableColumn:(NSTableColumn *)tableColumn
item:(id)item
{
- playlist_t *p_playlist = pl_Hold( VLCIntf );
+ /* 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 )]];
+ o_playing_item = [o_outline_dict objectForKey: [NSString stringWithFormat:@"%p", playlist_CurrentPlayingItem( p_playlist )]];
PL_UNLOCK;
if( [self isItem: [o_playing_item pointerValue] inNode:
{
[cell setFont: [[NSFontManager sharedFontManager] convertFont:[cell font] toNotHaveTrait:NSBoldFontMask]];
}
- vlc_object_release( p_playlist );
-}
-
-- (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
+- (id)playingItem
{
- NSAutoreleasePool * ourPool = [[NSAutoreleasePool alloc] init];
-
- /* simply adds a new node to the end of the playlist */
- playlist_t * p_playlist = pl_Hold( VLCIntf );
- vlc_thread_set_priority( p_playlist, VLC_THREAD_PRIORITY_LOW );
+ playlist_t *p_playlist = pl_Get( VLCIntf );
- 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 );
+ id o_playing_item;
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 */
- playlist_NodeCreate( p_playlist, _("Empty Folder"),
- p_playlist->p_local_category, 0, NULL );
- }
+ o_playing_item = [o_outline_dict objectForKey: [NSString stringWithFormat:@"%p", playlist_CurrentPlayingItem( p_playlist )]];
PL_UNLOCK;
- free( psz_name );
- pl_Release( VLCIntf );
- [ourPool release];
+ return o_playing_item;
}
-@end
-
-@implementation VLCPlaylist (NSOutlineViewDataSource)
+- (NSArray *)draggedItems
+{
+ return [[o_nodes_array arrayByAddingObjectsFromArray: o_items_array] retain];
+}
-- (id)outlineView:(NSOutlineView *)outlineView child:(NSInteger)index ofItem:(id)item
+- (void)setColumn: (NSString *)o_column state: (NSInteger)i_state
{
- id o_value = [super outlineView: outlineView child: index ofItem: item];
- playlist_t *p_playlist = pl_Hold( VLCIntf );
+ NSTableColumn * o_work_tc;
- PL_LOCK;
- if( playlist_CurrentSize( p_playlist ) >= 2 )
+ if (i_state == NSOnState)
{
- [o_status_field setStringValue: [NSString stringWithFormat:
- _NS("%i items"),
- playlist_CurrentSize( p_playlist )]];
- }
- else
- {
- if( playlist_IsEmpty( p_playlist ) )
+ o_work_tc = [[NSTableColumn alloc] initWithIdentifier: o_column];
+ [o_work_tc setEditable: NO];
+ [[o_work_tc dataCell] setFont: [NSFont controlContentFontOfSize:11.]];
+
+ /* we cannot use a makro here, because gettext isn't clever enough for that */
+ if ([o_column isEqualToString: TRACKNUM_COLUMN])
{
- [o_status_field setStringValue: _NS("No items in the playlist")];
+ [o_work_tc setMaxWidth: 20.];
+ [[o_work_tc headerCell] setStringValue: @"#"];
}
- else
+ else if ([o_column isEqualToString: TITLE_COLUMN])
{
- [o_status_field setStringValue: _NS("1 item")];
+ [[o_work_tc headerCell] setStringValue: _NS("Name")];
+ [o_work_tc setResizingMask: NSTableColumnAutoresizingMask | NSTableColumnUserResizingMask];
}
+ else if ([o_column isEqualToString: ARTIST_COLUMN])
+ [[o_work_tc headerCell] setStringValue: _NS("Author")];
+ else if ([o_column isEqualToString: DURATION_COLUMN])
+ [[o_work_tc headerCell] setStringValue: _NS("Duration")];
+ else if ([o_column isEqualToString: GENRE_COLUMN])
+ [[o_work_tc headerCell] setStringValue: _NS("Genre")];
+ else if ([o_column isEqualToString: ALBUM_COLUMN])
+ [[o_work_tc headerCell] setStringValue: _NS("Album")];
+ else if ([o_column isEqualToString: DESCRIPTION_COLUMN])
+ [[o_work_tc headerCell] setStringValue: _NS("Description")];
+ else if ([o_column isEqualToString: DATE_COLUMN])
+ [[o_work_tc headerCell] setStringValue: _NS("Date")];
+ else if ([o_column isEqualToString: LANGUAGE_COLUMN])
+ [[o_work_tc headerCell] setStringValue: _NS("Language")];
+ else if ([o_column isEqualToString: URI_COLUMN])
+ [[o_work_tc headerCell] setStringValue: _NS("URI")];
+
+ [o_outline_view addTableColumn: o_work_tc];
+ [o_work_tc release];
+ [o_outline_view reloadData];
+ [o_outline_view setNeedsDisplay: YES];
}
- PL_UNLOCK;
+ else
+ [o_outline_view removeTableColumn: [o_outline_view tableColumnWithIdentifier: o_column]];
+}
- vlc_object_release( p_playlist );
+- (void)saveTableColumns
+{
+ NSMutableArray * o_arrayToSave = [[NSMutableArray alloc] init];
+ NSArray * o_columns = [[NSArray alloc] initWithArray:[o_outline_view tableColumns]];
+ 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]];
+ }
+ [[NSUserDefaults standardUserDefaults] setObject: o_arrayToSave forKey:@"PlaylistColumnSelection"];
+ [[NSUserDefaults standardUserDefaults] synchronize];
+ [o_columns release];
+ [o_arrayToSave release];
+}
- [o_outline_dict setObject:o_value forKey:[NSString stringWithFormat:@"%p",
- [o_value pointerValue]]];
- return o_value;
+@end
+
+@implementation VLCPlaylist (NSOutlineViewDataSource)
+- (id)outlineView:(NSOutlineView *)outlineView child:(NSInteger)index ofItem:(id)item
+{
+ id o_value = [super outlineView: outlineView child: index ofItem: item];
+
+ [o_outline_dict setObject:o_value forKey:[NSString stringWithFormat:@"%p", [o_value pointerValue]]];
+ return o_value;
}
/* Required for drag & drop and reordering */
- (BOOL)outlineView:(NSOutlineView *)outlineView writeItems:(NSArray *)items toPasteboard:(NSPasteboard *)pboard
{
- unsigned int i;
- playlist_t *p_playlist = pl_Hold( VLCIntf );
+ playlist_t *p_playlist = pl_Get( VLCIntf );
/* First remove the items that were moved during the last drag & drop
operation */
[o_items_array removeAllObjects];
[o_nodes_array removeAllObjects];
- for( i = 0 ; i < [items count] ; i++ )
+ NSUInteger itemCount = [items count];
+
+ for( NSUInteger i = 0 ; i < itemCount ; i++ )
{
id o_item = [items objectAtIndex: i];
- /* Refuse to move items that are not in the General Node
- (Service Discovery) */
- if( ![self isItem: [o_item pointerValue] inNode:
- p_playlist->p_local_category checkItemExistence: NO] &&
- var_CreateGetBool( p_playlist, "media-library" ) &&
- ![self isItem: [o_item pointerValue] inNode:
- p_playlist->p_ml_category checkItemExistence: NO] ||
- [o_item pointerValue] == p_playlist->p_local_category ||
- [o_item pointerValue] == p_playlist->p_ml_category )
- {
- vlc_object_release(p_playlist);
- 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];
@"VLCPlaylistItemPboardType", nil] owner: self];
[pboard setData:[NSData data] forType:@"VLCPlaylistItemPboardType"];
- vlc_object_release(p_playlist);
return YES;
}
- (NSDragOperation)outlineView:(NSOutlineView *)outlineView validateDrop:(id <NSDraggingInfo>)info proposedItem:(id)item proposedChildIndex:(NSInteger)index
{
- playlist_t *p_playlist = pl_Hold( VLCIntf );
+ playlist_t *p_playlist = pl_Get( 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 );
return NSDragOperationNone;
}
}
- /* Don't allow on drop on playlist root element's child */
- if( !item && index != NSOutlineViewDropOnItemIndex)
- {
- vlc_object_release( p_playlist );
- return NSDragOperationNone;
- }
-
/* We refuse to drop an item in anything else than a child of the General
Node. We still accept items that would be root nodes of the outlineview
however, to allow drop in an empty playlist. */
- if( !( ([self isItem: [item pointerValue] inNode: p_playlist->p_local_category checkItemExistence: NO] ||
+ if( !( ([self isItem: [item pointerValue] inNode: p_playlist->p_local_category checkItemExistence: NO] ||
( var_CreateGetBool( p_playlist, "media-library" ) && [self isItem: [item pointerValue] inNode: p_playlist->p_ml_category checkItemExistence: NO] ) ) || item == nil ) )
{
- vlc_object_release( p_playlist );
return NSDragOperationNone;
}
/* Drop from the Playlist */
if( [[o_pasteboard types] containsObject: @"VLCPlaylistItemPboardType"] )
{
- unsigned int i;
- for( i = 0 ; i < [o_nodes_array count] ; i++ )
+ 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] )
{
- vlc_object_release( p_playlist );
return NSDragOperationNone;
}
}
- vlc_object_release( p_playlist );
return NSDragOperationMove;
}
/* Drop from the Finder */
else if( [[o_pasteboard types] containsObject: NSFilenamesPboardType] )
{
- vlc_object_release( p_playlist );
return NSDragOperationGeneric;
}
- vlc_object_release( p_playlist );
return NSDragOperationNone;
}
- (BOOL)outlineView:(NSOutlineView *)outlineView acceptDrop:(id <NSDraggingInfo>)info item:(id)item childIndex:(NSInteger)index
{
- playlist_t * p_playlist = pl_Hold( VLCIntf );
+ playlist_t * p_playlist = pl_Get( VLCIntf );
NSPasteboard *o_pasteboard = [info draggingPasteboard];
/* Drag & Drop inside the playlist */
if( [[o_pasteboard types] containsObject: @"VLCPlaylistItemPboardType"] )
{
- int i_row, i_removed_from_node = 0;
- unsigned int i;
+ int i_row = 0;
playlist_item_t *p_new_parent, *p_item = NULL;
- NSArray *o_all_items = [o_nodes_array arrayByAddingObjectsFromArray:
- o_items_array];
+ 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 General node.
+ child of the respective general node, if is either the pl or the ml
Else, choose the proposed parent as parent. */
- if( item == nil ) p_new_parent = p_playlist->p_local_category;
- else p_new_parent = [item pointerValue];
+ 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 )
{
- vlc_object_release( p_playlist );
return NO;
}
- for( i = 0; i < [o_all_items count]; i++ )
- {
- playlist_item_t *p_old_parent = NULL;
- int i_old_index = 0;
+ 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];
- p_old_parent = p_item->p_parent;
- if( !p_old_parent )
- continue;
- /* We may need the old index later */
- if( p_new_parent == p_old_parent )
- {
- int j;
- for( j = 0; j < p_old_parent->i_children; j++ )
- {
- if( p_old_parent->pp_children[j] == p_item )
- {
- i_old_index = j;
- break;
- }
- }
- }
+ if( p_item )
+ pp_items[j++] = p_item;
+ }
- PL_LOCK;
- // Actually detach the item from the old position
- if( playlist_NodeRemoveItem( p_playlist, p_item, p_old_parent ) ==
- VLC_SUCCESS )
- {
- int i_new_index;
- /* Calculate the new index */
- if( index == -1 )
- i_new_index = -1;
- /* If we move the item in the same node, we need to take into
- account that one item will be deleted */
- else
- {
- if ((p_new_parent == p_old_parent &&
- i_old_index < index + (int)i) )
- {
- i_removed_from_node++;
- }
- i_new_index = index + i - i_removed_from_node;
- }
- // Reattach the item to the new position
- playlist_NodeInsert( p_playlist, p_item, p_new_parent, i_new_index );
- }
+ if( j == 0 || playlist_TreeMoveMany( p_playlist, j, pp_items, p_new_parent, index ) != VLC_SUCCESS )
+ {
PL_UNLOCK;
+ free( pp_items );
+ return NO;
}
+
+ PL_UNLOCK;
+ free( pp_items );
+
[self playlistUpdated];
- i_row = [o_outline_view rowForItem:[o_outline_dict
- objectForKey:[NSString stringWithFormat: @"%p",
- [[o_all_items objectAtIndex: 0] pointerValue]]]];
+ i_row = [o_outline_view rowForItem:[o_outline_dict objectForKey:[NSString stringWithFormat: @"%p", [[o_all_items objectAtIndex: 0] pointerValue]]]];
if( i_row == -1 )
{
- i_row = [o_outline_view rowForItem:[o_outline_dict
- objectForKey:[NSString stringWithFormat: @"%p", p_new_parent]]];
+ i_row = [o_outline_view rowForItem:[o_outline_dict objectForKey:[NSString stringWithFormat: @"%p", p_new_parent]]];
}
[o_outline_view deselectAll: self];
- [o_outline_view selectRow: i_row byExtendingSelection: NO];
+ [o_outline_view selectRowIndexes:[NSIndexSet indexSetWithIndex:i_row] byExtendingSelection:NO];
[o_outline_view scrollRowToVisible: i_row];
- vlc_object_release( p_playlist );
return YES;
}
else if( [[o_pasteboard types] containsObject: NSFilenamesPboardType] )
{
- int i;
+ if ([self currentPlaylistRoot] != p_playlist->p_local_category && [self currentPlaylistRoot] != p_playlist->p_ml_category)
+ return NO;
+
playlist_item_t *p_node = [item pointerValue];
- NSArray *o_array = [NSArray array];
- NSArray *o_values = [[o_pasteboard propertyListForType:
- NSFilenamesPboardType]
- sortedArrayUsingSelector:
- @selector(caseInsensitiveCompare:)];
+ 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;
+
+ if (count == 1 && p_input)
+ {
+ b_returned = input_AddSubtitle( p_input, make_URI([[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 );
- for( i = 0; i < (int)[o_values count]; i++)
+ for( NSUInteger i = 0; i < count; i++)
{
NSDictionary *o_dic;
- o_dic = [NSDictionary dictionaryWithObject:[o_values
- objectAtIndex:i] forKey:@"ITEM_URL"];
- o_array = [o_array arrayByAddingObject: o_dic];
+ char *psz_uri = make_URI([[o_values objectAtIndex:i] UTF8String], NULL);
+ if( !psz_uri )
+ continue;
+
+ o_dic = [NSDictionary dictionaryWithObject:[NSString stringWithCString:psz_uri encoding:NSUTF8StringEncoding] forKey:@"ITEM_URL"];
+
+ free( psz_uri );
+
+ [o_array addObject: o_dic];
}
if ( item == nil )
else
{
assert( p_node->i_children != -1 );
- [self appendNodeArray:o_array inNode: p_node
- atPos:index enqueue:YES];
+ [self appendNodeArray:o_array inNode: p_node atPos:index enqueue:YES];
}
- vlc_object_release( p_playlist );
return YES;
}
- vlc_object_release( p_playlist );
return NO;
}
-@end
-
+@end
projects / vlc / blobdiff