/*****************************************************************************
* playlist.m: MacOS X interface module
*****************************************************************************
- * Copyright (C) 2002-2004 VideoLAN
+* Copyright (C) 2002-2008 the VideoLAN team
* $Id$
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
- * Derk-Jan Hartman <hartman at videolan dot org>
+ * Derk-Jan Hartman <hartman at videola/n dot org>
* Benjamin Pracht <bigben at videolab dot org>
*
* This program is free software; you can redistribute it and/or modify
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/* TODO
* add 'icons' for different types of nodes? (http://www.cocoadev.com/index.pl?IconAndTextInTableCell)
- * create a new 'playlist toggle' that hides the playlist and in effect give you the old controller
- * create a new search field build with pictures from the 'regular' search field, so it can be emulated on 10.2
- * create toggle buttons for the shuffle, repeat one, repeat all functions.
- * implement drag and drop and item reordering.
* 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
*/
-
/*****************************************************************************
* Preamble
*****************************************************************************/
#include <sys/mount.h>
#include <vlc_keys.h>
-#include "intf.h"
-#include "playlist.h"
-#include "controls.h"
-#include "osd.h"
-#include "misc.h"
-
-#define REF_HEIGHT 500
-#define REF_WIDTH 500
+#import "intf.h"
+#import "wizard.h"
+#import "bookmarks.h"
+#import "playlistinfo.h"
+#import "playlist.h"
+#import "controls.h"
+#import "vlc_osd.h"
+#import "misc.h"
+#import <vlc_interface.h>
/*****************************************************************************
- * VLCPlaylistView implementation
+ * VLCPlaylistView implementation
*****************************************************************************/
@implementation VLCPlaylistView
[[self delegate] deleteItem:self];
break;
+ case NSEnterCharacter:
+ case NSCarriageReturnCharacter:
+ [(VLCPlaylist *)[[VLCMain sharedInstance] getPlaylist] playItem:self];
+ break;
+
default:
[super keyDown: o_event];
break;
@end
/*****************************************************************************
- * VLCPlaylist implementation
+ * VLCPlaylistCommon implementation
+ *
+ * This class the superclass of the VLCPlaylist and VLCPlaylistWizard.
+ * It contains the common methods and elements of these 2 entities.
*****************************************************************************/
-@implementation VLCPlaylist
+@implementation VLCPlaylistCommon
- (id)init
{
self = [super init];
- if ( self !=nil )
+ if ( self != nil )
{
- //i_moveRow = -1;
+ o_outline_dict = [[NSMutableDictionary alloc] init];
}
return self;
}
-
- (void)awakeFromNib
{
+ playlist_t * p_playlist = pl_Yield( VLCIntf );
[o_outline_view setTarget: self];
[o_outline_view setDelegate: self];
[o_outline_view setDataSource: self];
+ [o_outline_view setAllowsEmptySelection: NO];
- [o_outline_view setDoubleAction: @selector(playItem:)];
+ vlc_object_release( p_playlist );
+ [self initStrings];
+}
- [o_outline_view registerForDraggedTypes:
- [NSArray arrayWithObjects: NSFilenamesPboardType, nil]];
- [o_outline_view setIntercellSpacing: NSMakeSize (0.0, 1.0)];
+- (void)initStrings
+{
+ [[o_tc_name headerCell] setStringValue:_NS("Name")];
+ [[o_tc_author headerCell] setStringValue:_NS("Author")];
+ [[o_tc_duration headerCell] setStringValue:_NS("Duration")];
+}
-/* We need to check whether _defaultTableHeaderSortImage exists, since it
-belongs to an Apple hidden private API, and then can "disapear" at any time*/
+- (NSOutlineView *)outlineView
+{
+ return o_outline_view;
+}
- if( [[NSOutlineView class] respondsToSelector:@selector(_defaultTableHeaderSortImage)] )
+- (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 */
+- (int)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item
+{
+ int i_return = 0;
+ playlist_item_t *p_item = NULL;
+ playlist_t * p_playlist = pl_Yield( VLCIntf );
+ assert( outlineView == o_outline_view );
+
+ if( !item )
+ p_item = p_playlist->p_root_category;
+ else
+ p_item = (playlist_item_t *)[item pointerValue];
+
+ if( p_item )
+ i_return = p_item->i_children;
+
+ pl_Release( VLCIntf );
+
+ return i_return > 0 ? i_return : 0;
+}
+
+/* return the child at index for the Obj-C pointer item */ /* DONE */
+- (id)outlineView:(NSOutlineView *)outlineView child:(int)index ofItem:(id)item
+{
+ playlist_item_t *p_return = NULL, *p_item = NULL;
+ NSValue *o_value;
+ playlist_t * p_playlist = pl_Yield( VLCIntf );
+
+ if( item == nil )
{
- o_ascendingSortingImage = [[NSOutlineView class] _defaultTableHeaderSortImage];
+ /* root object */
+ p_item = p_playlist->p_root_category;
}
else
{
- o_ascendingSortingImage = nil;
+ p_item = (playlist_item_t *)[item pointerValue];
}
+ if( p_item && index < p_item->i_children && index >= 0 )
+ p_return = p_item->pp_children[index];
+
+ vlc_object_release( p_playlist );
- if( [[NSOutlineView class] respondsToSelector:@selector(_defaultTableHeaderReverseSortImage)] )
+ o_value = [o_outline_dict objectForKey:[NSString stringWithFormat: @"%p", p_return]];
+
+ if( o_value == nil )
{
- o_descendingSortingImage = [[NSOutlineView class] _defaultTableHeaderReverseSortImage];
+ /* 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_Yield( VLCIntf );
+
+ if( item == nil )
+ {
+ /* root object */
+ if( p_playlist->p_root_category )
+ {
+ i_return = p_playlist->p_root_category->i_children;
+ }
}
else
{
- o_descendingSortingImage = nil;
+ playlist_item_t *p_item = (playlist_item_t *)[item pointerValue];
+ if( p_item )
+ i_return = p_item->i_children;
}
+ pl_Release( VLCIntf );
- o_outline_dict = [[NSMutableDictionary alloc] init];
- o_tc_sortColumn = nil;
-
- [self initStrings];
- //[self playlistUpdated];
+ return (i_return >= 0);
}
-- (void)initStrings
+/* retrieve the string values for the cells */
+- (id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTableColumn *)o_tc byItem:(id)item
{
- [o_mi_save_playlist setTitle: _NS("Save Playlist...")];
- [o_mi_play setTitle: _NS("Play")];
- [o_mi_delete setTitle: _NS("Delete")];
- [o_mi_selectall setTitle: _NS("Select All")];
- [o_mi_info setTitle: _NS("Properties")];
- [o_mi_sort_name setTitle: _NS("Sort Node by Name")];
- [o_mi_sort_author setTitle: _NS("Sort Node by Author")];
- [[o_tc_name headerCell] setStringValue:_NS("Name")];
- [[o_tc_author headerCell] setStringValue:_NS("Author")];
- [[o_tc_duration headerCell] setStringValue:_NS("Duration")];
- [o_status_field setStringValue: [NSString stringWithFormat:
- _NS("no items in playlist")]];
+ id o_value = nil;
+ playlist_item_t *p_item;
- [o_random_ckb setTitle: _NS("Random")];
-#if 0
- [o_search_button setTitle: _NS("Search")];
-#endif
- [o_btn_playlist setToolTip: _NS("Playlist")];
- [[o_loop_popup itemAtIndex:0] setTitle: _NS("Standard Play")];
- [[o_loop_popup itemAtIndex:1] setTitle: _NS("Repeat One")];
- [[o_loop_popup itemAtIndex:2] setTitle: _NS("Repeat All")];
-}
+ /* For error handling */
+ static BOOL attempted_reload = NO;
-- (IBAction)toggleWindow:(id)sender
-{
- NSRect o_rect;
- /*First, check if the playlist is visible*/
- if ( [o_controller frame].size.height == [o_controller minSize].height )
+ if( item == nil || ![item isKindOfClass: [NSValue class]] )
{
- /*Check if the stored heigth of the controller is usable (!= minSize)*/
- if ([o_controller getSizeWithPlaylist].height !=
- [o_controller minSize].height)
+ /* Attempt to fix the error by asking for a data redisplay
+ * This might cause infinite loop, so add a small check */
+ if( !attempted_reload )
{
- o_rect.size.height = [o_controller getSizeWithPlaylist].height;
+ attempted_reload = YES;
+ [outlineView reloadData];
}
- else
+ 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 )
{
- /*If the stored height is not usable, use a reference one*/
- o_rect.size.height = REF_HEIGHT;
+ attempted_reload = YES;
+ [outlineView reloadData];
}
+ return @"error";
+ }
+
+ attempted_reload = NO;
- /*Check if the controller width is the minimum one*/
- if ( [o_controller frame].size.width == [o_controller minSize].width)
+ if( [[o_tc identifier] isEqualToString:@"name"] )
+ {
+ /* sanity check to prevent the NSString class from crashing */
+ char *psz_title = input_item_GetTitle( p_item->p_input );
+ if( !EMPTY_STR( psz_title ) )
{
- /*If the controller width is minimum, check if the stored height
- of the playlist makes it visible*/
- if ([o_controller getSizeWithPlaylist].height !=
- [o_controller minSize].height)
- {
- o_rect.size.width = [o_controller getSizeWithPlaylist].width;
- }
- else
- {
- /*If not, use a reference width*/
- o_rect.size.width = REF_WIDTH;
- }
+ o_value = [NSString stringWithUTF8String: psz_title];
}
else
{
- o_rect.size.width = [o_controller frame].size.width;
+ 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"] )
+ {
+ char *psz_artist = input_item_GetArtist( p_item->p_input );
+ if( psz_artist )
+ o_value = [NSString stringWithUTF8String: psz_artist];
+ free( psz_artist );
+ }
+ else if( [[o_tc identifier] isEqualToString:@"duration"] )
+ {
+ char psz_duration[MSTRTIME_MAX_SIZE];
+ mtime_t dur = input_item_GetDuration( p_item->p_input );
+ if( dur != -1 )
+ {
+ secstotimestr( psz_duration, dur/1000000 );
+ o_value = [NSString stringWithUTF8String: psz_duration];
}
- o_rect.origin.x = [o_controller frame].origin.x;
- o_rect.origin.y = [o_controller frame].origin.y - o_rect.size.height +
- [o_controller minSize].height;
+ else
+ o_value = @"--:--";
+ }
+ else if( [[o_tc identifier] isEqualToString:@"status"] )
+ {
+ if( input_ItemHasErrorWhenReading( p_item->p_input ) )
+ {
+ o_value = [NSImage imageWithWarningIcon];
+ }
+ }
+ return o_value;
+}
+
+@end
+
+/*****************************************************************************
+ * VLCPlaylistWizard implementation
+ *****************************************************************************/
+@implementation VLCPlaylistWizard
- [o_btn_playlist setState: YES];
+- (IBAction)reloadOutlineView
+{
+ /* 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];
}
- else
+}
+
+@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
+ *****************************************************************************/
+
+@interface NSOutlineView (UndocumentedSortImages)
++ (NSImage *)_defaultTableHeaderSortImage;
++ (NSImage *)_defaultTableHeaderReverseSortImage;
+@end
+
+
+/*****************************************************************************
+ * VLCPlaylist implementation
+ *****************************************************************************/
+@implementation VLCPlaylist
+
+- (id)init
+{
+ self = [super init];
+ if ( self != nil )
{
- o_rect.size = [o_controller minSize];
- o_rect.origin.x = [o_controller frame].origin.x;
- /*Calculate the position of the lower right corner after resize*/
- o_rect.origin.y = [o_controller frame].origin.y +
- [o_controller frame].size.height - [o_controller minSize].height;
+ o_nodes_array = [[NSMutableArray alloc] init];
+ o_items_array = [[NSMutableArray alloc] init];
+ }
+ return self;
+}
+
+- (void)dealloc
+{
+ [o_nodes_array release];
+ [o_items_array release];
+ [super dealloc];
+}
+
+- (void)awakeFromNib
+{
+ playlist_t * p_playlist = pl_Yield( VLCIntf );
+
+ int i;
+
+ [super awakeFromNib];
- [o_btn_playlist setState: NO];
+ [o_outline_view 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_ascendingSortingImage = [[NSOutlineView class] _defaultTableHeaderSortImage];
+ o_descendingSortingImage = [[NSOutlineView class] _defaultTableHeaderReverseSortImage];
+
+ o_tc_sortColumn = nil;
+
+ char ** ppsz_name;
+ char ** ppsz_services = services_discovery_GetServicesNames( p_playlist, &ppsz_name );
+ if( !ppsz_services )
+ {
+ vlc_object_release( p_playlist );
+ return;
}
+
+ 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 );
+}
- [o_controller setFrame: o_rect display:YES animate: YES];
+- (void)searchfieldChanged:(NSNotification *)o_notification
+{
+ [o_search_field setStringValue:[[o_notification object] stringValue]];
}
-- (void)playlistUpdated
+- (void)initStrings
{
- unsigned int i;
+ [super initStrings];
- /* Clear indications of any existing column sorting*/
- for( i = 0 ; i < [[o_outline_view tableColumns] count] ; i++ )
+ [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_selectall setTitle: _NS("Select All")];
+ [o_mi_info setTitle: _NS("Information...")];
+ [o_mi_preparse setTitle: _NS("Fetch Meta Data")];
+ [o_mi_sort_name setTitle: _NS("Sort Node by Name")];
+ [o_mi_sort_author setTitle: _NS("Sort Node by Author")];
+ [o_mi_services setTitle: _NS("Services discovery")];
+ [o_status_field setStringValue: _NS("No items in the playlist")];
+
+ [o_search_field setToolTip: _NS("Search in Playlist")];
+ [o_mi_addNode setTitle: _NS("Add Folder to 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)")];
+}
+
+- (void)playlistUpdated
+{
+ /* Clear indications of any existing column sorting */
+ for( unsigned int i = 0 ; i < [[o_outline_view tableColumns] count] ; i++ )
{
[o_outline_view setIndicatorImage:nil inTableColumn:
[[o_outline_view tableColumns] objectAtIndex:i]];
[o_outline_view setHighlightedTableColumn:nil];
o_tc_sortColumn = nil;
- [o_outline_dict removeAllObjects];
+ // 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];
-- (void)updateTogglePlaylistState
-{
- if ([o_controller getSizeWithPlaylist].height ==
- [o_controller minSize].height)
+ playlist_t *p_playlist = pl_Yield( VLCIntf );
+
+ if( playlist_CurrentSize( p_playlist ) >= 2 )
{
- [o_btn_playlist setState: NO];
+ [o_status_field setStringValue: [NSString stringWithFormat:
+ _NS("%i items"),
+ playlist_CurrentSize( p_playlist )]];
}
else
{
- [o_btn_playlist setState: YES];
+ if( playlist_IsEmpty( p_playlist ) )
+ [o_status_field setStringValue: _NS("No items in the playlist")];
+ else
+ [o_status_field setStringValue: _NS("1 item")];
}
+ vlc_object_release( p_playlist );
+
+ [self outlineViewSelectionDidChange: nil];
+}
+
+- (void)playModeUpdated
+{
+ playlist_t *p_playlist = pl_Yield( 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 );
+}
+
+- (void)outlineViewSelectionDidChange:(NSNotification *)notification
+{
+ // FIXME: unsafe
+ playlist_item_t * p_item = [[o_outline_view itemAtRow:[o_outline_view selectedRow]] pointerValue];
+
+ if( p_item )
+ {
+ /* update our info-panel to reflect the new item */
+ [[[VLCMain sharedInstance] getInfo] updatePanelWithItem:p_item->p_input];
+ }
+}
+
+- (BOOL)isSelectionEmpty
+{
+ return [o_outline_view selectedRow] == -1;
}
- (void)updateRowSelection
{
- playlist_t * p_playlist = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- playlist_item_t * p_item, * p_temp_item;
- NSMutableArray * o_array = [NSMutableArray array];
- int i,i_row;
+ int i_row;
unsigned int j;
- if (p_playlist == NULL)
- return;
+ // FIXME: unsafe
+ playlist_t *p_playlist = pl_Yield( VLCIntf );
+ playlist_item_t *p_item, *p_temp_item;
+ NSMutableArray *o_array = [NSMutableArray array];
p_item = p_playlist->status.p_item;
- p_temp_item = p_item;
+ if( p_item == NULL )
+ {
+ vlc_object_release(p_playlist);
+ return;
+ }
- while (p_temp_item->i_parents > 0)
+ p_temp_item = p_item;
+ while( p_temp_item->p_parent )
{
[o_array insertObject: [NSValue valueWithPointer: p_temp_item] atIndex: 0];
- for (i = 0 ; i < p_temp_item->i_parents ; i++)
- {
- if (p_temp_item->pp_parents[i]->i_view == VIEW_SIMPLE)
- {
- p_temp_item = p_temp_item->pp_parents[i]->p_parent;
- break;
- }
- }
+ p_temp_item = p_temp_item->p_parent;
}
- for (j = 0 ; j < [o_array count] - 1 ; j++)
+ for( j = 0; j < [o_array count] - 1; j++ )
{
- [o_outline_view expandItem: [o_outline_dict objectForKey:
+ id o_item;
+ if( ( o_item = [o_outline_dict objectForKey:
[NSString stringWithFormat: @"%p",
- [[o_array objectAtIndex:j] pointerValue]]]];
+ [[o_array objectAtIndex:j] pointerValue]]] ) != nil )
+ {
+ [o_outline_view expandItem: o_item];
+ }
}
- i_row = [o_outline_view rowForItem:[o_outline_dict
- objectForKey:[NSString stringWithFormat: @"%p", p_item]]];
-
- [o_outline_view selectRow: i_row byExtendingSelection: NO];
- [o_outline_view scrollRowToVisible: i_row];
+ vlc_object_release( p_playlist );
- vlc_object_release(p_playlist);
}
-- (bool)isItem:(playlist_item_t *)p_item inNode:(playlist_item_t *)p_node
+/* 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 = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- playlist_item_t * p_temp_item = p_item;
+ playlist_t * p_playlist = pl_Yield( VLCIntf );
+ playlist_item_t *p_temp_item = p_item;
- if ( p_playlist == NULL )
+ 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;
}
- while ( p_temp_item->i_parents > 0 )
+ if ( p_temp_item )
{
int i;
- for (i = 0; i < p_temp_item->i_parents ; i++)
+ if(!b_locked) PL_LOCK;
+
+ if( b_check )
{
- if (p_temp_item->pp_parents[i]->i_view == VIEW_SIMPLE)
+ /* 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 (p_temp_item->pp_parents[i]->p_parent == p_node)
+ if( ARRAY_VAL( p_playlist->all_items, i) == p_item ) break;
+ else if ( i == p_playlist->all_items.i_size - 1 )
{
- vlc_object_release(p_playlist);
- return YES;
- }
- else
- {
- p_temp_item = p_temp_item->pp_parents[i]->p_parent;
- break;
+ if(!b_locked) PL_UNLOCK;
+ vlc_object_release( p_playlist );
+ return NO;
}
}
}
+
+ while( p_temp_item )
+ {
+ p_temp_item = p_temp_item->p_parent;
+ 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);
+ vlc_object_release( p_playlist );
return NO;
}
+- (BOOL)isItem: (playlist_item_t *)p_item
+ inNode: (playlist_item_t *)p_node
+ checkItemExistence:(BOOL)b_check
+{
+ [self isItem:p_item inNode:p_node checkItemExistence:b_check locked:NO];
+}
+
+/* This method is usefull for instance to remove the selected children of an
+ already selected node */
+- (void)removeItemsFrom:(id)o_items ifChildrenOf:(id)o_nodes
+{
+ unsigned int i, j;
+ for( i = 0 ; i < [o_items count] ; i++ )
+ {
+ for ( j = 0 ; j < [o_nodes count] ; 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;
+ }
+ }
+ }
+}
+
+- (IBAction)savePlaylist:(id)sender
+{
+ playlist_t * p_playlist = pl_Yield( 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];
+
+ if( [o_save_accessory_popup indexOfSelectedItem] == 1 )
+ {
+ NSString * o_real_filename;
+ NSRange range;
+ range.location = [o_filename length] - [@".xspf" length];
+ range.length = [@".xspf" length];
+
+ if( [o_filename compare:@".xspf" options: NSCaseInsensitiveSearch
+ range: range] != NSOrderedSame )
+ {
+ o_real_filename = [NSString stringWithFormat: @"%@.xspf", o_filename];
+ }
+ else
+ {
+ o_real_filename = o_filename;
+ }
+ playlist_Export( p_playlist,
+ [o_real_filename fileSystemRepresentation],
+ p_playlist->p_local_category, "export-xspf" );
+ }
+ else
+ {
+ 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" );
+ }
+ }
+ 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 = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
+ playlist_t * p_playlist = pl_Yield( p_intf );
- if( p_playlist != NULL )
- {
- playlist_item_t *p_item;
- playlist_item_t *p_node = NULL;
- int i;
+ playlist_item_t *p_item;
+ playlist_item_t *p_node = NULL;
- p_item = [[o_outline_view itemAtRow:[o_outline_view selectedRow]] pointerValue];
+ p_item = [[o_outline_view itemAtRow:[o_outline_view selectedRow]] pointerValue];
- if( p_item )
+ if( p_item )
+ {
+ if( p_item->i_children == -1 )
+ {
+ p_node = p_item->p_parent;
+
+ }
+ else
{
- if (p_item->i_children == -1)
+ p_node = p_item;
+ if( p_node->i_children > 0 && p_node->pp_children[0]->i_children == -1 )
{
- for (i = 0 ; i < p_item->i_parents ; i++)
- {
- if (p_item->pp_parents[i]->i_view == VIEW_SIMPLE)
- {
- p_node = p_item->pp_parents[i]->p_parent;
- }
- }
+ p_item = p_node->pp_children[0];
}
else
{
- p_node = p_item;
- if (p_node->pp_children[0]->i_children == -1 &&
- p_node->i_children > 0)
- {
- p_item = p_node->pp_children[0];
- }
- else
- {
- p_item = NULL;
- }
+ p_item = NULL;
}
+ }
+ playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, pl_Unlocked, p_node, p_item );
+ }
+ vlc_object_release( p_playlist );
+}
+
+/* When called retrieves the selected outlineview row and plays that node or item */
+- (IBAction)preparseItem:(id)sender
+{
+ int i_count;
+ NSMutableArray *o_to_preparse;
+ intf_thread_t * p_intf = VLCIntf;
+ playlist_t * p_playlist = pl_Yield( p_intf );
+
+ o_to_preparse = [NSMutableArray arrayWithArray:[[o_outline_view selectedRowEnumerator] allObjects]];
+ i_count = [o_to_preparse count];
-// p_view = playlist_ViewFind( p_playlist, VIEW_SIMPLE );
+ int i, i_row;
+ NSNumber *o_number;
+ playlist_item_t *p_item = NULL;
+ for( i = 0; i < i_count; i++ )
+ {
+ o_number = [o_to_preparse lastObject];
+ i_row = [o_number intValue];
+ p_item = [[o_outline_view itemAtRow:i_row] pointerValue];
+ [o_to_preparse removeObject: o_number];
+ [o_outline_view deselectRow: i_row];
- playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, VIEW_SIMPLE, p_node, p_item );
-// playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, VIEW_SIMPLE, p_view ? p_view->p_root : NULL, p_item );
+ 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" );
+ }
}
- vlc_object_release( p_playlist );
}
+ vlc_object_release( p_playlist );
+ [self playlistUpdated];
+}
+
+- (IBAction)servicesChange:(id)sender
+{
+ NSMenuItem *o_mi = (NSMenuItem *)sender;
+ NSString *o_string = [o_mi representedObject];
+ playlist_t * p_playlist = pl_Yield( VLCIntf );
+ 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, c, i_row;
+ int i_count, i_row;
NSMutableArray *o_to_delete;
NSNumber *o_number;
playlist_t * p_playlist;
intf_thread_t * p_intf = VLCIntf;
- p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
-
- if ( p_playlist == NULL )
- {
- return;
- }
o_to_delete = [NSMutableArray arrayWithArray:[[o_outline_view selectedRowEnumerator] allObjects]];
- c = [o_to_delete count];
+ i_count = [o_to_delete count];
- for( i = 0; i < c; i++ ) {
- playlist_item_t * p_item;
+ p_playlist = pl_Yield( p_intf );
+
+ PL_LOCK;
+ for( int i = 0; i < i_count; i++ )
+ {
o_number = [o_to_delete lastObject];
i_row = [o_number intValue];
-
+ id o_item = [o_outline_view itemAtRow: i_row];
+ playlist_item_t *p_item = [o_item pointerValue];
+#ifndef NDEBUG
+ msg_Dbg( p_intf, "deleting item %i (of %i) with id \"%i\", pointerValue \"%p\" and %i children", i+1, i_count,
+ p_item->p_input->i_id, [o_item pointerValue], p_item->i_children +1 );
+#endif
[o_to_delete removeObject: o_number];
[o_outline_view deselectRow: i_row];
- p_item = (playlist_item_t *)[[o_outline_view itemAtRow: i_row]pointerValue];
- if (p_item->i_children > -1)
+
+ if( p_item->i_children != -1 )
+ //is a node and not an item
{
- if (p_playlist->status.i_status)
- {
- if ([self isItem:p_playlist->status.p_item inNode: p_item]
- == YES && p_playlist->status.i_status)
- {
- playlist_Stop( p_playlist );
- }
- }
- playlist_NodeDelete( p_playlist, p_item, VLC_TRUE);
+ if( p_playlist->status.i_status != PLAYLIST_STOPPED &&
+ [self isItem: p_playlist->status.p_item 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
- {
- if( p_playlist->status.p_item == [[o_outline_view itemAtRow: i_row]
- pointerValue] && p_playlist->status.i_status )
- {
- playlist_Stop( p_playlist );
- }
- playlist_LockDelete( p_playlist, p_item->input.i_id );
- }
- [self playlistUpdated];
+ playlist_DeleteFromInput( p_playlist, p_item->p_input->i_id, pl_Locked );
}
+ PL_UNLOCK;
+
+ [self playlistUpdated];
+ vlc_object_release( p_playlist );
}
- (IBAction)sortNodeByName:(id)sender
- (IBAction)sortNodeByAuthor:(id)sender
{
- [self sortNode: SORT_AUTHOR];
+ [self sortNode: SORT_ARTIST];
}
- (void)sortNode:(int)i_mode
{
- playlist_t * p_playlist = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
+ playlist_t * p_playlist = pl_Yield( VLCIntf );
playlist_item_t * p_item;
- if (p_playlist == NULL)
+ if( [o_outline_view selectedRow] > -1 )
{
- return;
+ p_item = [[o_outline_view itemAtRow: [o_outline_view selectedRow]] pointerValue];
+ }
+ else
+ /*If no item is selected, sort the whole playlist*/
+ {
+ p_item = p_playlist->p_root_category;
+ }
+
+ 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 );
+ [self playlistUpdated];
+}
+
+- (input_item_t *)createItem:(NSDictionary *)o_one_item
+{
+ intf_thread_t * p_intf = VLCIntf;
+ playlist_t * p_playlist = pl_Yield( p_intf );
+
+ input_item_t *p_input;
+ int i;
+ BOOL b_rem = FALSE, b_dir = FALSE;
+ NSString *o_uri, *o_name;
+ NSArray *o_options;
+ NSURL *o_true_file;
+
+ /* Get the item */
+ o_uri = (NSString *)[o_one_item objectForKey: @"ITEM_URL"];
+ 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 )
+ {
+ 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++ )
+ {
+ 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]];
+ }
+ }
}
+ /* If no name, then make a guess */
+ if( !o_name) o_name = [[NSFileManager defaultManager] displayNameAtPath: o_uri];
- if ([o_outline_view selectedRow] > -1)
+ 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 )
{
- p_item = [[o_outline_view itemAtRow: [o_outline_view selectedRow]]
- pointerValue];
+ /* 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;
}
- else
- /*If no item is selected, sort the whole playlist*/
+
+ p_input = input_ItemNew( p_playlist, [o_uri fileSystemRepresentation], [o_name UTF8String] );
+ if( !p_input )
+ return NULL;
+
+ if( o_options )
{
- playlist_view_t * p_view = playlist_ViewFind( p_playlist, VIEW_SIMPLE );
- p_item = p_view->p_root;
+ for( i = 0; i < (int)[o_options count]; i++ )
+ {
+ input_ItemAddOption( p_input, strdup( [[o_options objectAtIndex:i] UTF8String] ) );
+ }
}
- if (p_item->i_children > -1)
+ /* Recent documents menu */
+ o_true_file = [NSURL fileURLWithPath: o_uri];
+ if( o_true_file != nil && (BOOL)config_GetInt( p_playlist, "macosx-recentitems" ) == YES )
{
- vlc_mutex_lock(&p_playlist->object_lock );
- playlist_RecursiveNodeSort( p_playlist, p_item, i_mode, ORDER_NORMAL );
- vlc_mutex_unlock(&p_playlist->object_lock );
+ [[NSDocumentController sharedDocumentController]
+ noteNewRecentDocumentURL: o_true_file];
}
- else
- {
- int i;
- for (i = 0 ; i < p_item->i_parents ; i++)
- {
- if (p_item->pp_parents[i]->i_view == VIEW_SIMPLE)
- {
- vlc_mutex_lock(&p_playlist->object_lock );
- playlist_RecursiveNodeSort( p_playlist,
- p_item->pp_parents[i]->p_parent, i_mode, ORDER_NORMAL );
- vlc_mutex_unlock(&p_playlist->object_lock );
- break;
- }
- }
- }
- vlc_object_release(p_playlist);
- [self playlistUpdated];
+ vlc_object_release( p_playlist );
+ return p_input;
}
- (void)appendArray:(NSArray*)o_array atPos:(int)i_position enqueue:(BOOL)b_enqueue
{
int i_item;
- intf_thread_t * p_intf = VLCIntf;
- playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
-
- if( p_playlist == NULL )
- {
- return;
- }
+ playlist_t * p_playlist = pl_Yield( VLCIntf );
- for ( i_item = 0; i_item < (int)[o_array count]; i_item++ )
+ PL_LOCK;
+ for( i_item = 0; i_item < (int)[o_array count]; i_item++ )
{
- /* One item */
+ input_item_t *p_input;
NSDictionary *o_one_item;
- int j, i_total_options = 0, i_new_id = -1;
- int i_mode = PLAYLIST_INSERT;
- BOOL b_rem = FALSE, b_dir = FALSE;
- NSString *o_uri, *o_name;
- NSArray *o_options;
- NSURL *o_true_file;
- char **ppsz_options = NULL;
/* Get the item */
o_one_item = [o_array objectAtIndex: i_item];
- o_uri = (NSString *)[o_one_item objectForKey: @"ITEM_URL"];
- o_name = (NSString *)[o_one_item objectForKey: @"ITEM_NAME"];
- o_options = (NSArray *)[o_one_item objectForKey: @"ITEM_OPTIONS"];
-
- /* If no name, then make a guess */
- if( !o_name) o_name = [[NSFileManager defaultManager] displayNameAtPath: o_uri];
-
- 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;
- buf = (struct statfs *) malloc (sizeof(struct statfs));
- statfs( [o_uri fileSystemRepresentation], buf );
- psz_dev = strdup(buf->f_mntfromname);
- o_uri = [NSString stringWithCString: psz_dev ];
- }
-
- if( o_options && [o_options count] > 0 )
+ p_input = [self createItem: o_one_item];
+ if( !p_input )
{
- /* Count the input options */
- i_total_options = [o_options count];
-
- /* Allocate ppsz_options */
- for( j = 0; j < i_total_options; j++ )
- {
- if( !ppsz_options )
- ppsz_options = (char **)malloc( sizeof(char *) * i_total_options );
-
- ppsz_options[j] = strdup([[o_options objectAtIndex:j] UTF8String]);
- }
+ continue;
}
/* Add the item */
- i_new_id = playlist_AddExt( p_playlist, [o_uri fileSystemRepresentation],
- [o_name UTF8String], i_mode,
- i_position == -1 ? PLAYLIST_END : i_position + i_item,
- 0, (ppsz_options != NULL ) ? (const char **)ppsz_options : 0, i_total_options );
-
- /* clean up
- for( j = 0; j < i_total_options; j++ )
- free( ppsz_options[j] );
- if( ppsz_options ) free( ppsz_options ); */
-
- /* Recent documents menu */
- o_true_file = [NSURL fileURLWithPath: o_uri];
- if( o_true_file != nil )
- {
- [[NSDocumentController sharedDocumentController]
- noteNewRecentDocumentURL: o_true_file];
- }
+ /* FIXME: playlist_AddInput() can fail */
+
+ playlist_AddInput( p_playlist, p_input, PLAYLIST_INSERT,
+ i_position == -1 ? PLAYLIST_END : i_position + i_item, true,
+ pl_Locked );
if( i_item == 0 && !b_enqueue )
{
- playlist_Goto( p_playlist, playlist_GetPositionById( p_playlist, i_new_id ) );
- playlist_Play( p_playlist );
+ playlist_item_t *p_item;
+ p_item = playlist_ItemGetByInput( p_playlist, p_input, pl_Locked );
+ playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, pl_Locked, NULL, p_item );
}
+ vlc_gc_decref( p_input );
}
+ PL_UNLOCK;
+ [self playlistUpdated];
vlc_object_release( p_playlist );
}
-- (IBAction)handlePopUp:(id)sender
-
+- (void)appendNodeArray:(NSArray*)o_array inNode:(playlist_item_t *)p_node atPos:(int)i_position enqueue:(BOOL)b_enqueue
{
- intf_thread_t * p_intf = VLCIntf;
- vlc_value_t val1,val2;
- playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- if( p_playlist == NULL )
- {
- return;
- }
-
- switch ([o_loop_popup indexOfSelectedItem])
- {
- case 1:
-
- val1.b_bool = 0;
- var_Set( p_playlist, "loop", val1 );
- val1.b_bool = 1;
- var_Set( p_playlist, "repeat", val1 );
- vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Repeat One" ) );
- break;
-
- case 2:
- val1.b_bool = 0;
- var_Set( p_playlist, "repeat", val1 );
- val1.b_bool = 1;
- var_Set( p_playlist, "loop", val1 );
- vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Repeat All" ) );
- break;
+ int i_item;
+ playlist_t * p_playlist = pl_Yield( VLCIntf );
- default:
- var_Get( p_playlist, "repeat", &val1 );
- var_Get( p_playlist, "loop", &val2 );
- if (val1.b_bool || val2.b_bool)
- {
- val1.b_bool = 0;
- var_Set( p_playlist, "repeat", val1 );
- var_Set( p_playlist, "loop", val1 );
- vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Repeat Off" ) );
- }
- break;
- }
- vlc_object_release( p_playlist );
- [self playlistUpdated];
+ for( i_item = 0; i_item < (int)[o_array 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;
+
+ /* Add the item */
+ /* FIXME: playlist_BothAddInput() can fail */
+ PL_LOCK;
+ playlist_BothAddInput( p_playlist, p_input, p_node,
+ PLAYLIST_INSERT,
+ i_position == -1 ?
+ PLAYLIST_END : i_position + i_item,
+ NULL, NULL, pl_Locked );
+
+
+ if( i_item == 0 && !b_enqueue )
+ {
+ playlist_item_t *p_item;
+ p_item = playlist_ItemGetByInput( p_playlist, p_input, pl_Locked );
+ playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, pl_Locked, NULL, p_item );
+ }
+ PL_UNLOCK;
+ vlc_gc_decref( p_input );
+ }
+ [self playlistUpdated];
+ vlc_object_release( p_playlist );
}
- (NSMutableArray *)subSearchItem:(playlist_item_t *)p_item
{
- playlist_t * p_playlist = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- playlist_item_t * p_selected_item;
+ playlist_t *p_playlist = pl_Yield( VLCIntf );
+ playlist_item_t *p_selected_item;
int i_current, i_selected_row;
- if (!p_playlist)
- return NULL;
-
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 (i_current = 0; i_current < p_item->i_children ; i_current++)
+ for( i_current = 0; i_current < p_item->i_children ; i_current++ )
{
- char * psz_temp;
- NSString * o_current_name, * o_current_author;
+ char *psz_temp;
+ NSString *o_current_name, *o_current_author;
- vlc_mutex_lock( &p_playlist->object_lock );
+ PL_LOCK;
o_current_name = [NSString stringWithUTF8String:
- p_item->pp_children[i_current]->input.psz_name];
- psz_temp = playlist_ItemGetInfo(p_item ,_("Meta-information"),_("Author") );
+ p_item->pp_children[i_current]->p_input->psz_name];
+ psz_temp = input_ItemGetInfo( p_item->p_input ,
+ _("Meta-information"),_("Artist") );
o_current_author = [NSString stringWithUTF8String: psz_temp];
free( psz_temp);
- vlc_mutex_unlock( &p_playlist->object_lock );
+ PL_UNLOCK;
- if (p_selected_item == p_item->pp_children[i_current] &&
- b_selected_item_met == NO)
+ 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)
+ else if( p_selected_item == p_item->pp_children[i_current] &&
+ b_selected_item_met == YES )
{
- vlc_object_release(p_playlist);
+ vlc_object_release( p_playlist );
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))
+ 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 ) )
{
- vlc_object_release(p_playlist);
+ 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
valueWithPointer: p_item->pp_children[i_current]]];
}
- if (p_item->pp_children[i_current]->i_children > 0)
+ 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)
+ if( o_result != NULL )
{
- vlc_object_release(p_playlist);
+ 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);
+ vlc_object_release( p_playlist );
return NULL;
}
- (IBAction)searchItem:(id)sender
{
- playlist_t * p_playlist = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- playlist_view_t * p_view;
+ playlist_t * p_playlist = pl_Yield( VLCIntf );
id o_result;
unsigned int i;
b_selected_item_met = NO;
- if( p_playlist == NULL )
- return;
-
- p_view = playlist_ViewFind( p_playlist, VIEW_SIMPLE );
-
- if (p_view)
- {
/*First, only search after the selected item:*
*(b_selected_item_met = NO) */
- o_result = [self subSearchItem:p_view->p_root];
- if (o_result == NULL)
- {
- /* If the first search failed, search again from the beginning */
- o_result = [self subSearchItem:p_view->p_root];
- }
- if (o_result != NULL)
- {
- for (i = 0 ; i < [o_result 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: [o_result count] - 1 ]
- pointerValue]]]];
- }
- if (i_row > -1)
+ o_result = [self subSearchItem:p_playlist->p_root_category];
+ if( o_result == NULL )
+ {
+ /* If the first search failed, search again from the beginning */
+ o_result = [self subSearchItem:p_playlist->p_root_category];
+ }
+ 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;
+
+ for( i = i_start ; i < [o_result count] - 1 ; i++ )
{
- [o_outline_view selectRow:i_row byExtendingSelection: NO];
- [o_outline_view scrollRowToVisible: i_row];
+ [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: [o_result count] - 1 ]
+ pointerValue]]]];
+ }
+ if( i_row > -1 )
+ {
+ [o_outline_view selectRow: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];
+
+ 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]];
}
- vlc_object_release(p_playlist);
+ /* 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];
}
- (NSMenu *)menuForEvent:(NSEvent *)o_event
{
NSPoint pt;
- vlc_bool_t b_rows;
- vlc_bool_t b_item_sel;
+ bool b_rows;
+ bool b_item_sel;
pt = [o_outline_view convertPoint: [o_event locationInWindow]
fromView: nil];
- b_item_sel = ( [o_outline_view rowAtPoint: pt] != -1 &&
- [o_outline_view selectedRow] != -1 );
+ NSInteger row = [o_outline_view rowAtPoint:pt];
+ if( row != -1 )
+ [o_outline_view selectRowIndexes:[NSIndexSet indexSetWithIndex:row] byExtendingSelection:NO];
+
+ b_item_sel = ( row != -1 && [o_outline_view selectedRow] != -1 );
b_rows = [o_outline_view numberOfRows] != 0;
[o_mi_play setEnabled: b_item_sel];
[o_mi_delete setEnabled: b_item_sel];
[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];
return( o_ctx_menu );
}
-- (playlist_item_t *)selectedPlaylistItem
-{
- return [[o_outline_view itemAtRow: [o_outline_view selectedRow]]
- pointerValue];
-}
-
-- (void) outlineView:(NSTableView*)o_tv
+- (void)outlineView: (NSTableView*)o_tv
didClickTableColumn:(NSTableColumn *)o_tc
{
- intf_thread_t * p_intf = VLCIntf;
- playlist_t *p_playlist =
- (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- playlist_view_t * p_view = playlist_ViewFind( p_playlist, VIEW_SIMPLE );
int i_mode = 0, i_type;
+ intf_thread_t *p_intf = VLCIntf;
- if( p_playlist == NULL )
- {
- return;
- }
+ playlist_t *p_playlist = pl_Yield( 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))
+ if( !( o_tc == o_tc_name || o_tc == o_tc_author ) )
{
+ vlc_object_release( p_playlist );
return;
}
}
else
{
- b_isSortDescending = VLC_FALSE;
+ b_isSortDescending = false;
}
- if (o_tc == o_tc_name)
+ if( o_tc == o_tc_name )
{
i_mode = SORT_TITLE;
}
- else if (o_tc == o_tc_author)
+ else if( o_tc == o_tc_author )
{
- i_mode = SORT_AUTHOR;
+ i_mode = SORT_ARTIST;
}
- if (b_isSortDescending)
+ if( b_isSortDescending )
{
i_type = ORDER_REVERSE;
}
i_type = ORDER_NORMAL;
}
- vlc_mutex_lock(&p_playlist->object_lock );
- playlist_RecursiveNodeSort(p_playlist, p_view->p_root, i_mode, i_type);
- vlc_mutex_unlock(&p_playlist->object_lock );
+ vlc_object_lock( p_playlist );
+ playlist_RecursiveNodeSort( p_playlist, p_playlist->p_root_category, i_mode, i_type );
+ vlc_object_unlock( p_playlist );
vlc_object_release( p_playlist );
[self playlistUpdated];
o_tc_sortColumn = o_tc;
[o_outline_view setHighlightedTableColumn:o_tc];
- if (b_isSortDescending)
+ if( b_isSortDescending )
{
[o_outline_view setIndicatorImage:o_descendingSortingImage
inTableColumn:o_tc];
}
}
-@end
-
-@implementation VLCPlaylist (NSOutlineViewDataSource)
-/* return the number of children for Obj-C pointer item */ /* DONE */
-- (int)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item
+- (void)outlineView:(NSOutlineView *)outlineView
+ willDisplayCell:(id)cell
+ forTableColumn:(NSTableColumn *)tableColumn
+ item:(id)item
{
- int i_return = 0;
- playlist_t * p_playlist = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- if( p_playlist == NULL )
- return 0;
+ playlist_t *p_playlist = pl_Yield( VLCIntf );
- if( item == nil )
+ id o_playing_item;
+
+ o_playing_item = [o_outline_dict objectForKey:
+ [NSString stringWithFormat:@"%p", p_playlist->status.p_item]];
+
+ if( [self isItem: [o_playing_item pointerValue] inNode:
+ [item pointerValue] checkItemExistence: YES]
+ || [o_playing_item isEqual: item] )
{
- /* root object */
- playlist_view_t *p_view;
- p_view = playlist_ViewFind( p_playlist, VIEW_SIMPLE );
- if( p_view && p_view->p_root )
- i_return = p_view->p_root->i_children;
+ [cell setFont: [[NSFontManager sharedFontManager] convertFont:[cell font] toHaveTrait:NSBoldFontMask]];
}
else
{
- playlist_item_t *p_item = (playlist_item_t *)[item pointerValue];
- if( p_item )
- i_return = p_item->i_children;
+ [cell setFont: [[NSFontManager sharedFontManager] convertFont:[cell font] toNotHaveTrait:NSBoldFontMask]];
}
vlc_object_release( p_playlist );
- if( i_return == -1 ) i_return = 0;
- msg_Dbg( p_playlist, "I have %d children", i_return );
- return i_return;
}
-/* return the child at index for the Obj-C pointer item */ /* DONE */
-- (id)outlineView:(NSOutlineView *)outlineView child:(int)index ofItem:(id)item
+- (IBAction)addNode:(id)sender
{
- playlist_item_t *p_return = NULL;
- playlist_t * p_playlist = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- NSValue * o_value;
+ /* 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];
+}
- if( p_playlist == NULL )
- return nil;
+- (void)addNodeThreadedly
+{
+ NSAutoreleasePool * ourPool = [[NSAutoreleasePool alloc] init];
- if( item == nil )
+ /* simply adds a new node to the end of the playlist */
+ playlist_t * p_playlist = pl_Yield( VLCIntf );
+ vlc_thread_set_priority( p_playlist, VLC_THREAD_PRIORITY_LOW );
+
+ int ret_v;
+ char *psz_name = NULL;
+ ret_v = intf_UserStringInput( p_playlist, _("New Node"),
+ _("Please enter a name for the new node."), &psz_name );
+
+ PL_LOCK;
+ if( ret_v != DIALOG_CANCELLED && psz_name )
{
- /* root object */
- playlist_view_t *p_view;
- p_view = playlist_ViewFind( p_playlist, VIEW_SIMPLE );
- if( p_view && index < p_view->p_root->i_children )
- p_return = p_view->p_root->pp_children[index];
+ 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 );
+ }
+ PL_UNLOCK;
+
+ free( psz_name );
+ pl_Release( VLCIntf );
+ [ourPool release];
+}
+
+@end
+
+@implementation VLCPlaylist (NSOutlineViewDataSource)
+
+- (id)outlineView:(NSOutlineView *)outlineView child:(int)index ofItem:(id)item
+{
+ id o_value = [super outlineView: outlineView child: index ofItem: item];
+ playlist_t *p_playlist = pl_Yield( VLCIntf );
+
+ if( playlist_CurrentSize( p_playlist ) >= 2 )
+ {
+ [o_status_field setStringValue: [NSString stringWithFormat:
+ _NS("%i items"),
+ playlist_CurrentSize( p_playlist )]];
}
else
{
- playlist_item_t *p_item = (playlist_item_t *)[item pointerValue];
- if( p_item && index < p_item->i_children )
+ if( playlist_IsEmpty( p_playlist ) )
{
- p_return = p_item->pp_children[index];
+ [o_status_field setStringValue: _NS("No items in the playlist")];
}
- }
-
- if( p_playlist->i_size >= 2 )
+ else
{
- [o_status_field setStringValue: [NSString stringWithFormat:
- _NS("%i items in playlist"), p_playlist->i_size]];
- } else {
- if( p_playlist->i_size == 0 )
- {
- [o_status_field setStringValue: [NSString stringWithFormat:
- _NS("no items in playlist"), p_playlist->i_size]];
- } else {
- [o_status_field setStringValue: [NSString stringWithFormat:
- _NS("1 item in playlist"), p_playlist->i_size]];
- }
+ [o_status_field setStringValue: _NS("1 item")];
+ }
}
-
vlc_object_release( p_playlist );
- msg_Dbg( p_playlist, "childitem with index %d", index );
-
- o_value = [NSValue valueWithPointer: p_return];
- [o_outline_dict setObject:o_value forKey:[NSString stringWithFormat:@"%p", p_return]];
+ [o_outline_dict setObject:o_value forKey:[NSString stringWithFormat:@"%p",
+ [o_value pointerValue]]];
return o_value;
+
}
-/* is the item expandable */
-- (BOOL)outlineView:(NSOutlineView *)outlineView isItemExpandable:(id)item
+/* Required for drag & drop and reordering */
+- (BOOL)outlineView:(NSOutlineView *)outlineView writeItems:(NSArray *)items toPasteboard:(NSPasteboard *)pboard
{
- int i_return = 0;
- playlist_t * p_playlist = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- if( p_playlist == NULL )
- return NO;
+ unsigned int i;
+ playlist_t *p_playlist = pl_Yield( VLCIntf );
- if( item == nil )
- {
- /* root object */
- playlist_view_t *p_view;
- p_view = playlist_ViewFind( p_playlist, VIEW_SIMPLE );
- if( p_view && p_view->p_root )
- i_return = p_view->p_root->i_children;
- }
- else
+ /* 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++ )
{
- playlist_item_t *p_item = (playlist_item_t *)[item pointerValue];
- if( p_item )
- i_return = p_item->i_children;
+ 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]) )
+ {
+ 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];
+ else
+ [o_items_array addObject: o_item];
}
- vlc_object_release( p_playlist );
- if( i_return == -1 || i_return == 0 )
- return NO;
- else
- 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];
+
+ /* We add the "VLCPlaylistItemPboardType" type to be able to recognize
+ a Drop operation coming from the playlist. */
+
+ [pboard declareTypes: [NSArray arrayWithObjects:
+ @"VLCPlaylistItemPboardType", nil] owner: self];
+ [pboard setData:[NSData data] forType:@"VLCPlaylistItemPboardType"];
+
+ vlc_object_release(p_playlist);
+ return YES;
}
-/* retrieve the string values for the cells */
-- (id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTableColumn *)o_tc byItem:(id)item
+- (NSDragOperation)outlineView:(NSOutlineView *)outlineView validateDrop:(id <NSDraggingInfo>)info proposedItem:(id)item proposedChildIndex:(int)index
{
- id o_value = nil;
- intf_thread_t * p_intf = VLCIntf;
- playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- playlist_item_t *p_item = (playlist_item_t *)[item pointerValue];
+ playlist_t *p_playlist = pl_Yield( VLCIntf );
+ NSPasteboard *o_pasteboard = [info draggingPasteboard];
- if( p_playlist == NULL || p_item == NULL )
+ if( !p_playlist ) return NSDragOperationNone;
+
+ /* Dropping ON items is not allowed if item is not a node */
+ if( item )
{
- return( @"error" );
+ if( index == NSOutlineViewDropOnItemIndex &&
+ ((playlist_item_t *)[item pointerValue])->i_children == -1 )
+ {
+ vlc_object_release( p_playlist );
+ return NSDragOperationNone;
+ }
}
- if( [[o_tc identifier] isEqualToString:@"1"] )
+ /* Don't allow on drop on playlist root element's child */
+ if( !item && index != NSOutlineViewDropOnItemIndex)
{
- o_value = [NSString stringWithUTF8String:
- p_item->input.psz_name];
- if( o_value == NULL )
- o_value = [NSString stringWithCString:
- p_item->input.psz_name];
+ vlc_object_release( p_playlist );
+ return NSDragOperationNone;
}
- else if( [[o_tc identifier] isEqualToString:@"2"] )
+
+ /* 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] ||
+ ( var_CreateGetBool( p_playlist, "media-library" ) && [self isItem: [item pointerValue] inNode: p_playlist->p_ml_category checkItemExistence: NO] ) ) || item == nil ) )
{
- char *psz_temp;
- psz_temp = playlist_ItemGetInfo( p_item ,_("Meta-information"),_("Artist") );
+ vlc_object_release( p_playlist );
+ return NSDragOperationNone;
+ }
- if( psz_temp == NULL )
- o_value = @"";
- else
+ /* Drop from the Playlist */
+ if( [[o_pasteboard types] containsObject: @"VLCPlaylistItemPboardType"] )
+ {
+ unsigned int i;
+ for( i = 0 ; i < [o_nodes_array count] ; i++ )
{
- o_value = [NSString stringWithUTF8String: psz_temp];
- if( o_value == NULL )
+ /* 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] )
{
- o_value = [NSString stringWithCString: psz_temp];
+ vlc_object_release( p_playlist );
+ return NSDragOperationNone;
}
- free( psz_temp );
}
+ 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;
}
- else if( [[o_tc identifier] isEqualToString:@"3"] )
+ vlc_object_release( p_playlist );
+ return NSDragOperationNone;
+}
+
+- (BOOL)outlineView:(NSOutlineView *)outlineView acceptDrop:(id <NSDraggingInfo>)info item:(id)item childIndex:(int)index
+{
+ playlist_t * p_playlist = pl_Yield( VLCIntf );
+ NSPasteboard *o_pasteboard = [info draggingPasteboard];
+
+ /* Drag & Drop inside the playlist */
+ if( [[o_pasteboard types] containsObject: @"VLCPlaylistItemPboardType"] )
{
- char psz_duration[MSTRTIME_MAX_SIZE];
- mtime_t dur = p_item->input.i_duration;
- if( dur != -1 )
+ int i_row, i_removed_from_node = 0;
+ unsigned int i;
+ 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 General node.
+ Else, choose the proposed parent as parent. */
+ if( item == nil ) p_new_parent = p_playlist->p_local_category;
+ 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 )
{
- secstotimestr( psz_duration, dur/1000000 );
- o_value = [NSString stringWithUTF8String: psz_duration];
+ vlc_object_release( p_playlist );
+ return NO;
}
- else
+
+ for( i = 0; i < [o_all_items count]; i++ )
{
- o_value = @"-:--:--";
+ playlist_item_t *p_old_parent = NULL;
+ int i_old_index = 0;
+
+ 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;
+ }
+ }
+ }
+
+ 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 );
+ }
+ PL_UNLOCK;
}
- }
+ [self playlistUpdated];
+ i_row = [o_outline_view rowForItem:[o_outline_dict
+ objectForKey:[NSString stringWithFormat: @"%p",
+ [[o_all_items objectAtIndex: 0] pointerValue]]]];
- vlc_object_release( p_playlist );
+ if( i_row == -1 )
+ {
+ i_row = [o_outline_view rowForItem:[o_outline_dict
+ objectForKey:[NSString stringWithFormat: @"%p", p_new_parent]]];
+ }
- return( o_value );
-}
+ [o_outline_view deselectAll: self];
+ [o_outline_view selectRow: i_row byExtendingSelection: NO];
+ [o_outline_view scrollRowToVisible: i_row];
-/* Required for drag & drop and reordering */
-- (BOOL)outlineView:(NSOutlineView *)outlineView writeItems:(NSArray *)items toPasteboard:(NSPasteboard *)pboard
-{
- return NO;
-}
+ vlc_object_release( p_playlist );
+ return YES;
+ }
-- (NSDragOperation)outlineView:(NSOutlineView *)outlineView validateDrop:(id <NSDraggingInfo>)info proposedItem:(id)item proposedChildIndex:(int)index
-{
- return NSDragOperationNone;
-}
+ else if( [[o_pasteboard types] containsObject: NSFilenamesPboardType] )
+ {
+ int i;
+ playlist_item_t *p_node = [item pointerValue];
-/* Delegate method of NSWindow */
-/*- (void)windowWillClose:(NSNotification *)aNotification
-{
- [o_btn_playlist setState: NSOffState];
+ NSArray *o_array = [NSArray array];
+ NSArray *o_values = [[o_pasteboard propertyListForType:
+ NSFilenamesPboardType]
+ sortedArrayUsingSelector:
+ @selector(caseInsensitiveCompare:)];
+
+ for( i = 0; i < (int)[o_values count]; i++)
+ {
+ NSDictionary *o_dic;
+ o_dic = [NSDictionary dictionaryWithObject:[o_values
+ objectAtIndex:i] forKey:@"ITEM_URL"];
+ o_array = [o_array arrayByAddingObject: o_dic];
+ }
+
+ 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];
+ }
+ vlc_object_release( p_playlist );
+ return YES;
+ }
+ vlc_object_release( p_playlist );
+ return NO;
}
-*/
@end
projects / vlc / blobdiff