/*****************************************************************************
* playlist.m: MacOS X interface module
*****************************************************************************
- * Copyright (C) 2002-2004 VideoLAN
+* Copyright (C) 2002-2005 VideoLAN
* $Id$
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
/* 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.
#include "osd.h"
#include "misc.h"
-#define REF_HEIGHT 500
-#define REF_WIDTH 500
-
/*****************************************************************************
* VLCPlaylistView implementation
*****************************************************************************/
[[self delegate] deleteItem:self];
break;
+ case NSEnterCharacter:
+ case NSCarriageReturnCharacter:
+ [(VLCPlaylist *)[[VLCMain sharedInstance] getPlaylist]
+ playItem:self];
+ break;
+
default:
[super keyDown: o_event];
break;
[o_outline_view setDoubleAction: @selector(playItem:)];
- [o_outline_view registerForDraggedTypes:
+ [o_outline_view registerForDraggedTypes:
[NSArray arrayWithObjects: NSFilenamesPboardType, nil]];
[o_outline_view setIntercellSpacing: NSMakeSize (0.0, 1.0)];
if( !strcmp( p_parser->psz_capability, "services_discovery" ) )
{
+ /* create the menu entries used in the playlist menu */
o_lmi = [[o_mi_services submenu] addItemWithTitle:
- [NSString stringWithCString:
+ [NSString stringWithUTF8String:
+ p_parser->psz_longname ? p_parser->psz_longname :
+ ( p_parser->psz_shortname ? p_parser->psz_shortname:
+ p_parser->psz_object_name)]
+ action: @selector(servicesChange:)
+ keyEquivalent: @""];
+ [o_lmi setTarget: self];
+ [o_lmi setRepresentedObject:
+ [NSString stringWithCString: p_parser->psz_object_name]];
+ if( playlist_IsServicesDiscoveryLoaded( p_playlist,
+ p_parser->psz_object_name ) )
+ [o_lmi setState: NSOnState];
+
+ /* create the menu entries for the main menu */
+ o_lmi = [[o_mm_mi_services submenu] addItemWithTitle:
+ [NSString stringWithUTF8String:
p_parser->psz_longname ? p_parser->psz_longname :
( p_parser->psz_shortname ? p_parser->psz_shortname:
p_parser->psz_object_name)]
vlc_list_release( p_list );
vlc_object_release( p_playlist );
+ /* Change the simple textfield into a searchField if we can... */
+#if 0
+ if( MACOS_VERSION >= 10.3 )
+ {
+ NSView *o_parentview = [o_status_field superview];
+ NSSearchField *o_better_search_field = [[NSSearchField alloc]initWithFrame:[o_search_field frame]];
+ [o_better_search_field setRecentsAutosaveName:@"VLC media player search"];
+ [o_better_search_field setDelegate:self];
+ [[NSNotificationCenter defaultCenter] addObserver: self
+ selector: @selector(searchfieldChanged:)
+ name: NSControlTextDidChangeNotification
+ object: o_better_search_field];
+
+ [o_better_search_field setTarget:self];
+ [o_better_search_field setAction:@selector(searchItem:)];
+
+ [o_better_search_field setAutoresizingMask:NSViewMinXMargin];
+ [o_parentview addSubview:o_better_search_field];
+ [o_search_field setHidden:YES];
+ }
+#endif
[self initStrings];
//[self playlistUpdated];
}
+- (void)searchfieldChanged:(NSNotification *)o_notification
+{
+ [o_search_field setStringValue:[[o_notification object] stringValue]];
+}
+
- (void)initStrings
{
[o_mi_save_playlist setTitle: _NS("Save Playlist...")];
#if 0
[o_search_button setTitle: _NS("Search")];
#endif
- [o_btn_playlist setToolTip: _NS("Playlist")];
+ [o_search_field setToolTip: _NS("Search in 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")];
}
-- (NSOutlineView *)playlistView
+- (NSOutlineView *)outlineView
{
return o_outline_view;
}
-- (IBAction)toggleWindow:(id)sender
-{
- NSRect o_rect;
- /*First, check if the playlist is visible*/
- if ( [o_controller frame].size.height == [o_controller minSize].height )
- {
- /*Check if the stored heigth of the controller is usable (!= minSize)*/
- if ([o_controller getSizeWithPlaylist].height !=
- [o_controller minSize].height)
- {
- o_rect.size.height = [o_controller getSizeWithPlaylist].height;
- }
- else
- {
- /*If the stored height is not usable, use a reference one*/
- o_rect.size.height = REF_HEIGHT;
- }
-
- /*Check if the controller width is the minimum one*/
- if ( [o_controller frame].size.width == [o_controller minSize].width)
- {
- /*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;
- }
- }
- else
- {
- o_rect.size.width = [o_controller frame].size.width;
- }
- 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;
-
- [o_btn_playlist setState: YES];
- }
- else
- {
- 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_btn_playlist setState: NO];
- }
-
- [o_controller setFrame: o_rect display:YES animate: YES];
-}
-
- (void)playlistUpdated
{
unsigned int i;
[o_outline_view reloadData];
}
-
-- (void)updateTogglePlaylistState
+- (void)playModeUpdated
{
- if( [o_controller getSizeWithPlaylist].height ==
- [o_controller minSize].height )
+ playlist_t *p_playlist = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
+ vlc_value_t val, val2;
+
+ if( p_playlist == NULL )
{
- [o_btn_playlist setState: NO];
+ return;
+ }
+
+ var_Get( p_playlist, "loop", &val2 );
+ var_Get( p_playlist, "repeat", &val );
+ if( val.b_bool == VLC_TRUE )
+ {
+ [o_loop_popup selectItemAtIndex: 1];
+ }
+ else if( val2.b_bool == VLC_TRUE )
+ {
+ [o_loop_popup selectItemAtIndex: 2];
}
else
{
- [o_btn_playlist setState: YES];
+ [o_loop_popup selectItemAtIndex: 0];
}
+
+ var_Get( p_playlist, "random", &val );
+ [o_random_ckb setState: val.b_bool];
+
+ vlc_object_release( p_playlist );
}
- (void)updateRowSelection
{
int i,i_row;
unsigned int j;
-
+
playlist_t *p_playlist = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
playlist_item_t *p_item, *p_temp_item;
return;
p_item = p_playlist->status.p_item;
- p_temp_item = p_item;
+ if( p_item == NULL ) return;
+ p_temp_item = p_item;
while( p_temp_item->i_parents > 0 )
{
[o_array insertObject: [NSValue valueWithPointer: p_temp_item] atIndex: 0];
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];
}
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++ )
+ vlc_mutex_lock( &p_playlist->object_lock );
+ while( p_temp_item->i_parents > 0 )
{
- if( p_temp_item->pp_parents[i]->i_view == i_current_view )
+ int i;
+ for( i = 0; i < p_temp_item->i_parents ; i++ )
{
- if( p_temp_item->pp_parents[i]->p_parent == p_node )
+ if( p_temp_item->pp_parents[i]->i_view == i_current_view )
{
- vlc_object_release( p_playlist );
- return YES;
- }
- else
- {
- p_temp_item = p_temp_item->pp_parents[i]->p_parent;
- break;
+ if( p_temp_item->pp_parents[i]->p_parent == p_node )
+ {
+ vlc_object_release( p_playlist );
+ vlc_mutex_unlock( &p_playlist->object_lock );
+ return YES;
+ }
+ else
+ {
+ p_temp_item = p_temp_item->pp_parents[i]->p_parent;
+ break;
+ }
}
}
}
+ vlc_mutex_unlock( &p_playlist->object_lock );
}
vlc_object_release( p_playlist );
return NO;
}
+- (IBAction)savePlaylist:(id)sender
+{
+ intf_thread_t * p_intf = VLCIntf;
+ playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
+
+ NSSavePanel *o_save_panel = [NSSavePanel savePanel];
+ NSString * o_name = [NSString stringWithFormat: @"%@.m3u", _NS("Untitled")];
+ [o_save_panel setTitle: _NS("Save Playlist")];
+ [o_save_panel setPrompt: _NS("Save")];
+
+ if( [o_save_panel runModalForDirectory: nil
+ file: o_name] == NSOKButton )
+ {
+ playlist_Export( p_playlist, [[o_save_panel filename] fileSystemRepresentation], "export-m3u" );
+ }
+}
+
/* When called retrieves the selected outlineview row and plays that node or item */
- (IBAction)playItem:(id)sender
p_item = NULL;
}
}
-
playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, i_current_view, p_node, p_item );
}
vlc_object_release( p_playlist );
[o_mi setState: playlist_IsServicesDiscoveryLoaded( p_playlist,
[o_string cString] ) ? YES : NO];
+
+ i_current_view = VIEW_CATEGORY;
+ playlist_ViewUpdate( p_playlist, i_current_view );
+ vlc_object_release( p_playlist );
[self playlistUpdated];
return;
}
[self playlistUpdated];
}
-- (void)appendArray:(NSArray*)o_array atPos:(int)i_position enqueue:(BOOL)b_enqueue
+- (playlist_item_t *)createItem:(NSDictionary *)o_one_item
{
- 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 NULL;
+ }
+ playlist_item_t *p_item;
+ 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 stringWithCString: mounts[i_index].f_mntfromname];
+ [o_temp replaceOccurrencesOfString: @"/dev/rdisk" withString: @"/dev/disk" options:NULL range:NSMakeRange(0, [o_temp length]) ];
+ [o_temp2 replaceOccurrencesOfString: @"s0" withString: @"" options:NULL range:NSMakeRange(0, [o_temp2 length]) ];
+ [o_temp2 replaceOccurrencesOfString: @"s1" withString: @"" options:NULL range:NSMakeRange(0, [o_temp2 length]) ];
+
+ if( strstr( [o_temp fileSystemRepresentation], [o_temp2 fileSystemRepresentation] ) != NULL )
+ {
+ o_name = [[NSFileManager defaultManager] displayNameAtPath: [NSString stringWithCString:mounts[i_index].f_mntonname]];
+ }
+ }
+ }
+ /* 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;
+ NSMutableString *o_temp;
+
+ buf = (struct statfs *) malloc (sizeof(struct statfs));
+ statfs( [o_uri fileSystemRepresentation], buf );
+ psz_dev = strdup(buf->f_mntfromname);
+ o_temp = [NSMutableString stringWithCString: psz_dev ];
+ [o_temp replaceOccurrencesOfString: @"/dev/disk" withString: @"/dev/rdisk" options:NULL range:NSMakeRange(0, [o_temp length]) ];
+ [o_temp replaceOccurrencesOfString: @"s0" withString: @"" options:NULL range:NSMakeRange(0, [o_temp length]) ];
+ [o_temp replaceOccurrencesOfString: @"s1" withString: @"" options:NULL range:NSMakeRange(0, [o_temp length]) ];
+ o_uri = o_temp;
+ }
+
+ p_item = playlist_ItemNew( p_intf, [o_uri fileSystemRepresentation], [o_name UTF8String] );
+ if( !p_item )
+ return NULL;
+
+ if( o_options )
+ {
+ for( i = 0; i < (int)[o_options count]; i++ )
+ {
+ playlist_ItemAddOption( p_item, strdup( [[o_options objectAtIndex:i] UTF8String] ) );
+ }
+ }
+
+ /* Recent documents menu */
+ o_true_file = [NSURL fileURLWithPath: o_uri];
+ if( o_true_file != nil )
+ {
+ [[NSDocumentController sharedDocumentController]
+ noteNewRecentDocumentURL: o_true_file];
+ }
+
+ vlc_object_release( p_playlist );
+ return p_item;
+}
+
+- (void)appendArray:(NSArray*)o_array atPos:(int)i_position enqueue:(BOOL)b_enqueue
+{
+ int i_item;
+ playlist_t * p_playlist = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
+ if( p_playlist == NULL )
{
return;
}
for( i_item = 0; i_item < (int)[o_array count]; i_item++ )
{
- /* One item */
+ playlist_item_t *p_item;
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"];
+ p_item = [self createItem: o_one_item];
+ if( !p_item )
+ {
+ continue;
+ }
- /* If no name, then make a guess */
- if( !o_name) o_name = [[NSFileManager defaultManager] displayNameAtPath: o_uri];
+ /* Add the item */
+ playlist_AddItem( p_playlist, p_item, PLAYLIST_APPEND, i_position == -1 ? PLAYLIST_END : i_position + i_item );
- 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 )
+ if( i_item == 0 && !b_enqueue )
{
- /* 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 ];
+ playlist_Control( p_playlist, PLAYLIST_ITEMPLAY, p_item );
}
+ }
+ vlc_object_release( p_playlist );
+}
- if( o_options && [o_options count] > 0 )
- {
- /* Count the input options */
- i_total_options = [o_options count];
+- (void)appendNodeArray:(NSArray*)o_array inNode:(playlist_item_t *)p_node atPos:(int)i_position inView:(int)i_view enqueue:(BOOL)b_enqueue
+{
+ int i_item;
+ playlist_t * p_playlist = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
+ if( p_playlist == NULL )
+ {
+ return;
+ }
- /* Allocate ppsz_options */
- for( j = 0; j < i_total_options; j++ )
- {
- if( !ppsz_options )
- ppsz_options = (char **)malloc( sizeof(char *) * i_total_options );
+ for( i_item = 0; i_item < (int)[o_array count]; i_item++ )
+ {
+ playlist_item_t *p_item;
+ NSDictionary *o_one_item;
- ppsz_options[j] = strdup([[o_options objectAtIndex:j] UTF8String]);
- }
+ /* Get the item */
+ o_one_item = [o_array objectAtIndex: i_item];
+ p_item = [self createItem: o_one_item];
+ if( !p_item )
+ {
+ 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 );
-
- /* Recent documents menu */
- o_true_file = [NSURL fileURLWithPath: o_uri];
- if( o_true_file != nil )
- {
- [[NSDocumentController sharedDocumentController]
- noteNewRecentDocumentURL: o_true_file];
- }
+ playlist_NodeAddItem( p_playlist, p_item, i_view, p_node, PLAYLIST_APPEND, i_position + i_item );
if( i_item == 0 && !b_enqueue )
{
- playlist_Goto( p_playlist, playlist_GetPositionById( p_playlist, i_new_id ) );
- playlist_Play( p_playlist );
+ playlist_Control( p_playlist, PLAYLIST_ITEMPLAY, p_item );
}
}
-
vlc_object_release( p_playlist );
+
}
- (IBAction)handlePopUp:(id)sender
if( p_playlist == NULL )
return;
-
p_view = playlist_ViewFind( p_playlist, i_current_view );
if( p_view )
}
}
+
+- (void)outlineView:(NSOutlineView *)outlineView
+ willDisplayCell:(id)cell
+ forTableColumn:(NSTableColumn *)tableColumn
+ item:(id)item
+{
+ playlist_t *p_playlist = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
+ playlist_item_t *p_item = (playlist_item_t *)[item pointerValue];
+
+ if( !p_playlist ) return;
+
+ if( ( p_item == p_playlist->status.p_item ) ||
+ ( p_item->i_children != 0 &&
+ [self isItem: p_playlist->status.p_item inNode: p_item] ) )
+ {
+ [cell setFont: [NSFont boldSystemFontOfSize: 0]];
+ }
+ else
+ {
+ [cell setFont: [NSFont systemFontOfSize: 0]];
+ }
+ vlc_object_release( p_playlist );
+}
+
@end
@implementation VLCPlaylist (NSOutlineViewDataSource)
}
vlc_object_release( p_playlist );
-
o_value = [[NSValue valueWithPointer: p_return] retain];
- if( [o_outline_dict objectForKey: [NSString stringWithFormat:@"%p", p_return]] == nil )
- {
- [o_outline_dict setObject:o_value forKey:[NSString stringWithFormat:@"%p", p_return]];
- }
+ [o_outline_dict setObject:o_value forKey:[NSString stringWithFormat:@"%p", p_return]];
return o_value;
}
{
return( @"error" );
}
-
+
p_item = (playlist_item_t *)[item pointerValue];
if( p_item == NULL )
/* Required for drag & drop and reordering */
- (BOOL)outlineView:(NSOutlineView *)outlineView writeItems:(NSArray *)items toPasteboard:(NSPasteboard *)pboard
{
+/* unsigned int i;
+
+ for( i = 0 ; i < [items count] ; i++ )
+ {
+ if( [outlineView levelForItem: [items objectAtIndex: i]] == 0 )
+ {
+ return NO;
+ }
+ }*/
return NO;
}
- (NSDragOperation)outlineView:(NSOutlineView *)outlineView validateDrop:(id <NSDraggingInfo>)info proposedItem:(id)item proposedChildIndex:(int)index
{
+ NSPasteboard *o_pasteboard = [info draggingPasteboard];
+
+ if( [[o_pasteboard types] containsObject: NSFilenamesPboardType] )
+ {
+ return NSDragOperationGeneric;
+ }
return NSDragOperationNone;
}
+- (BOOL)outlineView:(NSOutlineView *)outlineView acceptDrop:(id <NSDraggingInfo>)info item:(id)item childIndex:(int)index
+{
+ playlist_t * p_playlist = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
+ NSPasteboard *o_pasteboard = [info draggingPasteboard];
+
+ if( !p_playlist ) return NO;
+
+ if( [[o_pasteboard types] containsObject: NSFilenamesPboardType] )
+ {
+ int i;
+ playlist_item_t *p_node = [item pointerValue];
+
+ 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 if( p_node->i_children == -1 )
+ {
+ int i_counter;
+ playlist_item_t *p_real_node = NULL;
+
+ for( i_counter = 0 ; i_counter < p_node->i_parents ; i_counter++ )
+ {
+ if( p_node->pp_parents[i_counter]->i_view == i_current_view )
+ {
+ p_real_node = p_node->pp_parents[i_counter]->p_parent;
+ break;
+ }
+ if( i_counter == p_node->i_parents )
+ {
+ return NO;
+ }
+ }
+ [self appendNodeArray: o_array inNode: p_real_node
+ atPos: index inView: i_current_view enqueue: YES];
+ }
+ else
+ {
+ [self appendNodeArray: o_array inNode: p_node
+ atPos: index inView: i_current_view enqueue: YES];
+ }
+ vlc_object_release( p_playlist );
+ return YES;
+ }
+ vlc_object_release( p_playlist );
+ return NO;
+}
+
/* Delegate method of NSWindow */
/*- (void)windowWillClose:(NSNotification *)aNotification
{
projects / vlc / blobdiff