* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
+/* TODO
+ * connect delegates, actions and outlets in IB
+ * implement delete by backspace
+ * implement playlist item rightclick menu
+ * implement sorting
+ * 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
*****************************************************************************/
int i, c, i_row;
NSMutableArray *o_to_delete;
NSNumber *o_number;
-
- playlist_t * p_playlist;
- intf_thread_t * p_intf = [NSApp getIntf];
+ playlist_t * p_playlist;
+ intf_thread_t * p_intf = VLCIntf;
+msg_Dbg( p_intf, "KEYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYY");
if( [[o_event characters] length] )
{
key = [[o_event characters] characterAtIndex: 0];
p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
-
+
if ( p_playlist == NULL )
{
return;
}
-
+
switch( key )
{
case NSDeleteCharacter:
case NSBackspaceCharacter:
o_to_delete = [NSMutableArray arrayWithArray:[[self selectedRowEnumerator] allObjects]];
c = [o_to_delete count];
-
+
for( i = 0; i < c; i++ ) {
o_number = [o_to_delete lastObject];
i_row = [o_number intValue];
-
- if( p_playlist->i_index == i_row && p_playlist->i_status )
+
+ if( p_playlist->status.p_item == [[self itemAtRow: i_row] pointerValue] && p_playlist->status.i_status )
{
playlist_Stop( p_playlist );
}
[o_to_delete removeObject: o_number];
[self deselectRow: i_row];
- playlist_Delete( p_playlist, i_row );
+ playlist_ItemDelete( [[self itemAtRow: i_row] pointerValue] );
}
- [self reloadData];
break;
-
+
default:
[super keyDown: o_event];
break;
self = [super init];
if ( self !=nil )
{
- i_moveRow = -1;
+ //i_moveRow = -1;
}
return self;
}
- (void)awakeFromNib
{
- [o_table_view setTarget: self];
- [o_table_view setDelegate: self];
- [o_table_view setDataSource: self];
+ [o_outline_view setTarget: self];
+ [o_outline_view setDelegate: self];
+ [o_outline_view setDataSource: self];
- [o_table_view setDoubleAction: @selector(playItem:)];
+ [o_outline_view setDoubleAction: @selector(playItem:)];
- [o_table_view registerForDraggedTypes:
+ [o_outline_view registerForDraggedTypes:
[NSArray arrayWithObjects: NSFilenamesPboardType, nil]];
- [o_table_view setIntercellSpacing: NSMakeSize (0.0, 1.0)];
- [o_window setExcludedFromWindowsMenu: TRUE];
-
-// [o_tbv_info setDataSource: [VLCInfoDataSource init]];
+ [o_outline_view setIntercellSpacing: NSMakeSize (0.0, 1.0)];
/* We need to check whether _defaultTableHeaderSortImage exists, since it
belongs to an Apple hidden private API, and then can "disapear" at any time*/
- if( [[NSTableView class] respondsToSelector:@selector(_defaultTableHeaderSortImage)] )
+ if( [[NSOutlineView class] respondsToSelector:@selector(_defaultTableHeaderSortImage)] )
{
- o_ascendingSortingImage = [[NSTableView class] _defaultTableHeaderSortImage];
+ o_ascendingSortingImage = [[NSOutlineView class] _defaultTableHeaderSortImage];
}
else
{
o_ascendingSortingImage = nil;
}
- if( [[NSTableView class] respondsToSelector:@selector(_defaultTableHeaderReverseSortImage)] )
+ if( [[NSOutlineView class] respondsToSelector:@selector(_defaultTableHeaderReverseSortImage)] )
{
- o_descendingSortingImage = [[NSTableView class] _defaultTableHeaderReverseSortImage];
+ o_descendingSortingImage = [[NSOutlineView class] _defaultTableHeaderReverseSortImage];
}
else
{
o_descendingSortingImage = nil;
}
+ o_outline_dict = [[NSMutableDictionary alloc] init];
+
[self initStrings];
- [self playlistUpdated];
+ //[self playlistUpdated];
}
- (void)initStrings
{
- [o_window setTitle: _NS("Playlist")];
[o_mi_save_playlist setTitle: _NS("Save Playlist...")];
+#if 0
[o_mi_play setTitle: _NS("Play")];
[o_mi_delete setTitle: _NS("Delete")];
[o_mi_selectall setTitle: _NS("Select All")];
+ [o_mi_toggleItemsEnabled setTitle: _NS("Item Enabled")];
+ [o_mi_enableGroup setTitle: _NS("Enable all group items")];
+ [o_mi_disableGroup setTitle: _NS("Disable all group items")];
[o_mi_info setTitle: _NS("Properties")];
-
+#endif
[[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("0 items in playlist")]];
+
[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")];
}
-- (void) tableView:(NSTableView*)o_tv
- didClickTableColumn:(NSTableColumn *)o_tc
-{
- intf_thread_t * p_intf = [NSApp getIntf];
- playlist_t *p_playlist =
- (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
-
- int max = [[o_table_view tableColumns] count];
- int i;
-
- if( p_playlist == NULL )
- {
- return;
- }
-
- if( o_tc_sortColumn == o_tc )
- {
- b_isSortDescending = !b_isSortDescending;
- }
- else if( o_tc == o_tc_name || o_tc == o_tc_author ||
- o_tc == o_tc_id )
- {
- b_isSortDescending = VLC_FALSE;
- [o_table_view setHighlightedTableColumn:o_tc];
- o_tc_sortColumn = o_tc;
- for( i=0 ; i<max ; i++ )
- {
- [o_table_view setIndicatorImage:nil inTableColumn:[[o_table_view tableColumns] objectAtIndex:i]];
- }
- }
-
- if( o_tc_id == o_tc && !b_isSortDescending )
- {
- playlist_SortID( p_playlist , ORDER_NORMAL );
- [o_table_view setIndicatorImage:o_ascendingSortingImage inTableColumn:o_tc];
- }
- else if( o_tc_name == o_tc && !b_isSortDescending )
- {
- playlist_SortTitle( p_playlist , ORDER_NORMAL );
- [o_table_view setIndicatorImage:o_ascendingSortingImage inTableColumn:o_tc];
- }
- else if( o_tc_author == o_tc && !b_isSortDescending )
- {
- playlist_SortAuthor( p_playlist , ORDER_NORMAL );
- [o_table_view setIndicatorImage:o_ascendingSortingImage inTableColumn:o_tc];
- }
- else if( o_tc_id == o_tc && b_isSortDescending )
- {
- playlist_SortID( p_playlist , ORDER_REVERSE );
- [o_table_view setIndicatorImage:o_ascendingSortingImage inTableColumn:o_tc];
- }
- else if( o_tc_name == o_tc && b_isSortDescending )
- {
- playlist_SortTitle( p_playlist , ORDER_REVERSE );
- [o_table_view setIndicatorImage:o_descendingSortingImage inTableColumn:o_tc];
- }
- else if( o_tc_author == o_tc && b_isSortDescending )
- {
- playlist_SortAuthor( p_playlist , ORDER_REVERSE );
- [o_table_view setIndicatorImage:o_descendingSortingImage inTableColumn:o_tc];
- }
- vlc_object_release( p_playlist );
- [self playlistUpdated];
-}
-
-
-- (BOOL)tableView:(NSTableView *)o_tv
- shouldEditTableColumn:(NSTableColumn *)o_tc
- row:(int)i_row
-{
- return( NO );
-}
-
-- (NSMenu *)menuForEvent:(NSEvent *)o_event
-{
- NSPoint pt;
- vlc_bool_t b_rows;
- vlc_bool_t b_item_sel;
-
- pt = [o_table_view convertPoint: [o_event locationInWindow]
- fromView: nil];
- b_item_sel = ( [o_table_view rowAtPoint: pt] != -1 &&
- [o_table_view selectedRow] != -1 );
- b_rows = [o_table_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];
-
- return( o_ctx_menu );
-}
-
-- (IBAction)toggleWindow:(id)sender
-{
- if( [o_window isVisible] )
- {
- [o_window orderOut:sender];
- [o_btn_playlist setState:NSOffState];
- }
- else
- {
- [o_window makeKeyAndOrderFront:sender];
- [o_btn_playlist setState:NSOnState];
- }
-}
-
-- (IBAction)savePlaylist:(id)sender
+- (void)playlistUpdated
{
- intf_thread_t * p_intf = [NSApp getIntf];
- 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" );
- }
-
+ [o_outline_view reloadData];
}
- (IBAction)playItem:(id)sender
{
- intf_thread_t * p_intf = [NSApp getIntf];
+ intf_thread_t * p_intf = VLCIntf;
playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
if( p_playlist != NULL )
{
- playlist_Goto( p_playlist, [o_table_view selectedRow] );
+ playlist_item_t *p_item;
+ playlist_view_t *p_view;
+ p_view = playlist_ViewFind( p_playlist, VIEW_SIMPLE );
+ p_item = [[o_outline_view itemAtRow:[o_outline_view selectedRow]] pointerValue];
+
+ if( p_item )
+ playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, VIEW_SIMPLE, p_view ? p_view->p_root : NULL, p_item );
vlc_object_release( p_playlist );
}
}
-- (IBAction)deleteItems:(id)sender
+- (void)appendArray:(NSArray*)o_array atPos:(int)i_position enqueue:(BOOL)b_enqueue
{
- int i, c, i_row;
- NSMutableArray *o_to_delete;
- NSNumber *o_number;
-
- intf_thread_t * p_intf = [NSApp getIntf];
+ int i_item;
+ intf_thread_t * p_intf = VLCIntf;
playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
{
return;
}
-
- o_to_delete = [NSMutableArray arrayWithArray:[[o_table_view selectedRowEnumerator] allObjects]];
- c = (int)[o_to_delete count];
-
- for( i = 0; i < c; i++ ) {
- o_number = [o_to_delete lastObject];
- i_row = [o_number intValue];
-
- if( p_playlist->i_index == i_row && p_playlist->i_status )
- {
- playlist_Stop( p_playlist );
- }
- [o_to_delete removeObject: o_number];
- [o_table_view deselectRow: i_row];
- playlist_Delete( p_playlist, i_row );
- }
-
- vlc_object_release( p_playlist );
- /* this is actually duplicity, because the intf.m manage also updates the view
- * when the playlist changes. we do this on purpose, because else there is a
- * delay of .5 sec or so when we delete an item */
- [self playlistUpdated];
- [self updateRowSelection];
-}
+ for ( i_item = 0; i_item < (int)[o_array count]; i_item++ )
+ {
+ /* One 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;
-- (IBAction)selectAll:(id)sender
-{
- [o_table_view selectAll: nil];
-}
+ /* 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];
-- (IBAction)searchItem:(id)sender
-{
- int i_current = -1;
- NSString *o_current_name;
- NSString *o_current_author;
+ 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 ];
+ }
- intf_thread_t * p_intf = [NSApp getIntf];
- playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
-
- if( p_playlist == NULL )
- {
- return;
- }
- if( [o_table_view numberOfRows] < 1 )
- {
- return;
- }
+ if( o_options && [o_options count] > 0 )
+ {
+ /* Count the input options */
+ i_total_options = [o_options count];
- if( [o_table_view selectedRow] == [o_table_view numberOfRows]-1 )
- {
- i_current = -1;
- }
- else
- {
- i_current = [o_table_view selectedRow];
- }
+ /* Allocate ppsz_options */
+ for( j = 0; j < i_total_options; j++ )
+ {
+ if( !ppsz_options )
+ ppsz_options = (char **)malloc( sizeof(char *) * i_total_options );
- do
- {
- i_current++;
+ ppsz_options[j] = strdup([[o_options objectAtIndex:j] UTF8String]);
+ }
+ }
- vlc_mutex_lock( &p_playlist->object_lock );
- o_current_name = [NSString stringWithUTF8String:
- p_playlist->pp_items[i_current]->input.psz_name];
- o_current_author = [NSString stringWithUTF8String:
- playlist_GetInfo(p_playlist, i_current ,_("General"),_("Author") )];
- vlc_mutex_unlock( &p_playlist->object_lock );
+ /* 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 ); */
- if( [o_current_name rangeOfString:[o_search_keyword stringValue] options:NSCaseInsensitiveSearch ].length ||
- [o_current_author rangeOfString:[o_search_keyword stringValue] options:NSCaseInsensitiveSearch ].length )
+ /* Recent documents menu */
+ o_true_file = [NSURL fileURLWithPath: o_uri];
+ if( o_true_file != nil )
{
- [o_table_view selectRow: i_current byExtendingSelection: NO];
- [o_table_view scrollRowToVisible: i_current];
- break;
+ [[NSDocumentController sharedDocumentController]
+ noteNewRecentDocumentURL: o_true_file];
}
- if( i_current == [o_table_view numberOfRows] - 1 )
+
+ if( i_item == 0 && !b_enqueue )
{
- i_current = -1;
+ playlist_Goto( p_playlist, playlist_GetPositionById( p_playlist, i_new_id ) );
+ playlist_Play( p_playlist );
}
}
- while (i_current != [o_table_view selectedRow]);
+
vlc_object_release( p_playlist );
}
-
- (IBAction)handlePopUp:(id)sender
{
- intf_thread_t * p_intf = [NSApp getIntf];
+ 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 );
var_Set( p_playlist, "loop", val1 );
val1.b_bool = 1;
var_Set( p_playlist, "repeat", val1 );
- vout_OSDMessage( p_intf, _( "Repeat One" ) );
+ vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Repeat One" ) );
break;
case 2:
var_Set( p_playlist, "repeat", val1 );
val1.b_bool = 1;
var_Set( p_playlist, "loop", val1 );
- vout_OSDMessage( p_intf, _( "Repeat All" ) );
+ vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Repeat All" ) );
break;
default:
val1.b_bool = 0;
var_Set( p_playlist, "repeat", val1 );
var_Set( p_playlist, "loop", val1 );
- vout_OSDMessage( p_intf, _( "Repeat Off" ) );
+ vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Repeat Off" ) );
}
break;
}
[self playlistUpdated];
}
-
-- (void)appendArray:(NSArray*)o_array atPos:(int)i_position enqueue:(BOOL)b_enqueue
+- (NSMutableArray *)subSearchItem:(playlist_item_t *)p_item
{
- int i_item;
- intf_thread_t * p_intf = [NSApp getIntf];
- playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ playlist_t * p_playlist = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
+ playlist_item_t * p_selected_item;
+ int i_current, i_selected_row;
- if( p_playlist == NULL )
- {
- return;
- }
+ if (!p_playlist)
+ return NULL;
- for ( i_item = 0; i_item < (int)[o_array count]; i_item++ )
+ 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++)
{
- /* One 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"];
-
- /* 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 )
+ char * psz_temp;
+ NSString * o_current_name, * o_current_author;
+
+ vlc_mutex_lock( &p_playlist->object_lock );
+ o_current_name = [NSString stringWithUTF8String:
+ p_item->pp_children[i_current]->input.psz_name];
+ psz_temp = playlist_ItemGetInfo(p_item ,_("Meta-information"),_("Author") );
+ o_current_author = [NSString stringWithUTF8String: psz_temp];
+ free( psz_temp);
+ vlc_mutex_unlock( &p_playlist->object_lock );
+
+ if (p_selected_item == p_item->pp_children[i_current] &&
+ b_selected_item_met == NO)
{
- /* 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 ];
+ b_selected_item_met = YES;
}
-
- if( o_options && [o_options count] > 0 )
+ else if (p_selected_item == p_item->pp_children[i_current] &&
+ b_selected_item_met == YES)
{
- /* 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]);
- }
+ vlc_object_release(p_playlist);
+ return NULL;
}
-
- /* 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];
+ 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);
+ /*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( i_item == 0 && !b_enqueue )
+ if (p_item->pp_children[i_current]->i_children > 0)
{
- playlist_Goto( p_playlist, playlist_GetPositionById( p_playlist, i_new_id ) );
- playlist_Play( p_playlist );
+ id o_result = [self subSearchItem:
+ 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 );
+ vlc_object_release(p_playlist);
+ return NULL;
}
-- (void)playlistUpdated
+- (IBAction)searchItem:(id)sender
{
- vlc_value_t val1, val2;
- intf_thread_t * p_intf = [NSApp getIntf];
- playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ playlist_t * p_playlist = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
- if( p_playlist != NULL )
- {
- var_Get( p_playlist, "random", &val1 );
- [o_random_ckb setState: val1.b_bool];
+ playlist_view_t * p_view;
+ id o_result;
+
+ unsigned int i;
+ int i_row = -1;
+
+ b_selected_item_met = NO;
+
+ if( p_playlist == NULL )
+ return;
+
+ p_view = playlist_ViewFind( p_playlist, VIEW_SIMPLE );
- var_Get( p_playlist, "repeat", &val1 );
- var_Get( p_playlist, "loop", &val2 );
- if(val1.b_bool)
+ 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)
{
- [o_loop_popup selectItemAtIndex:1];
+ /* If the first search failed, search again from the beginning */
+ o_result = [self subSearchItem:p_view->p_root];
}
- else if(val2.b_bool)
+ if (o_result != NULL)
{
- [o_loop_popup selectItemAtIndex:2];
+ 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]]]];
}
- else
+ if (i_row > -1)
{
- [o_loop_popup selectItemAtIndex:0];
+ [o_outline_view selectRow:i_row byExtendingSelection: NO];
+ [o_outline_view scrollRowToVisible: i_row];
}
- vlc_object_release( p_playlist );
}
- [o_table_view reloadData];
+ vlc_object_release(p_playlist);
+
}
-- (void)updateRowSelection
+@end
+
+@implementation VLCPlaylist (NSOutlineViewDataSource)
+
+/* return the number of children for Obj-C pointer item */ /* DONE */
+- (int)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item
{
- int i_row;
+ int i_return = 0;
+ playlist_t * p_playlist = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
+ if( p_playlist == NULL )
+ return 0;
- intf_thread_t * p_intf = [NSApp getIntf];
- playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ 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
+ {
+ playlist_item_t *p_item = (playlist_item_t *)[item pointerValue];
+ if( p_item )
+ i_return = p_item->i_children;
+ }
+ 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
+{
+ playlist_item_t *p_return = NULL;
+ playlist_t * p_playlist = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
+ NSValue * o_value;
if( p_playlist == NULL )
+ return nil;
+
+ if( item == nil )
{
- return;
+ /* 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];
}
+ else
+ {
+ playlist_item_t *p_item = (playlist_item_t *)[item pointerValue];
+ if( p_item && index < p_item->i_children )
+ {
+ p_return = p_item->pp_children[index];
+ }
+ }
+
+ [o_status_field setStringValue: [NSString stringWithFormat:
+ _NS("%i items in playlist"), p_playlist->i_size]];
- i_row = p_playlist->i_index;
vlc_object_release( p_playlist );
+ msg_Dbg( p_playlist, "childitem with index %d", index );
- [o_table_view selectRow: i_row byExtendingSelection: NO];
- [o_table_view scrollRowToVisible: i_row];
-}
+ o_value = [NSValue valueWithPointer: p_return];
-- (int)selectedPlaylistItem
-{
- return [o_table_view selectedRow];
+ [o_outline_dict setObject:o_value forKey:[NSString stringWithFormat:@"%p", p_return]];
+ return o_value;
}
-@end
-
-@implementation VLCPlaylist (NSTableDataSource)
-
-- (int)numberOfRowsInTableView:(NSTableView *)o_tv
+/* is the item expandable */
+- (BOOL)outlineView:(NSOutlineView *)outlineView isItemExpandable:(id)item
{
- int i_count = 0;
- intf_thread_t * p_intf = [NSApp getIntf];
- playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ int i_return = 0;
+ playlist_t * p_playlist = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
+ if( p_playlist == NULL )
+ return NO;
- if( p_playlist != NULL )
+ if( item == nil )
{
- vlc_mutex_lock( &p_playlist->object_lock );
- i_count = p_playlist->i_size;
- vlc_mutex_unlock( &p_playlist->object_lock );
- vlc_object_release( p_playlist );
+ /* 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
+ {
+ playlist_item_t *p_item = (playlist_item_t *)[item pointerValue];
+ if( p_item )
+ i_return = p_item->i_children;
}
- [o_status_field setStringValue: [NSString stringWithFormat:_NS("%i items in playlist"), i_count]];
- return( i_count );
+ vlc_object_release( p_playlist );
+
+ if( i_return == -1 || i_return == 0 )
+ return NO;
+ else
+ return YES;
}
-- (id)tableView:(NSTableView *)o_tv
- objectValueForTableColumn:(NSTableColumn *)o_tc
- row:(int)i_row
+/* retrieve the string values for the cells */
+- (id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTableColumn *)o_tc byItem:(id)item
{
id o_value = nil;
- intf_thread_t * p_intf = [NSApp getIntf];
+ 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];
- if( p_playlist == NULL )
+ if( p_playlist == NULL || p_item == NULL )
{
- return( nil );
+ return( @"error" );
}
- if( [[o_tc identifier] isEqualToString:@"0"] )
+ if( [[o_tc identifier] isEqualToString:@"1"] )
{
- o_value = [NSString stringWithFormat:@"%i", i_row + 1];
- }
- else if( [[o_tc identifier] isEqualToString:@"1"] )
- {
- vlc_mutex_lock( &p_playlist->object_lock );
- o_value = [NSString stringWithUTF8String:
- p_playlist->pp_items[i_row]->input.psz_name];
+ o_value = [NSString stringWithUTF8String:
+ p_item->input.psz_name];
if( o_value == NULL )
- o_value = [NSString stringWithCString:
- p_playlist->pp_items[i_row]->input.psz_name];
- vlc_mutex_unlock( &p_playlist->object_lock );
+ o_value = [NSString stringWithCString:
+ p_item->input.psz_name];
}
else if( [[o_tc identifier] isEqualToString:@"2"] )
{
- vlc_mutex_lock( &p_playlist->object_lock );
- o_value = [NSString stringWithUTF8String:
- playlist_GetInfo(p_playlist, i_row ,_("General"),_("Author") )];
- if( o_value == NULL )
- o_value = [NSString stringWithCString:
- playlist_GetInfo(p_playlist, i_row ,_("General"),_("Author") )];
- vlc_mutex_unlock( &p_playlist->object_lock );
+ char *psz_temp;
+ psz_temp = playlist_ItemGetInfo( p_item ,_("Meta-information"),_("Artist") );
+
+ if( psz_temp == NULL )
+ o_value = @"";
+ else
+ {
+ o_value = [NSString stringWithUTF8String: psz_temp];
+ if( o_value == NULL )
+ {
+ o_value = [NSString stringWithCString: psz_temp];
+ }
+ free( psz_temp );
+ }
}
else if( [[o_tc identifier] isEqualToString:@"3"] )
{
char psz_duration[MSTRTIME_MAX_SIZE];
- mtime_t dur = p_playlist->pp_items[i_row]->i_duration;
+ mtime_t dur = p_item->input.i_duration;
if( dur != -1 )
{
secstotimestr( psz_duration, dur/1000000 );
return( o_value );
}
-- (void)tableView:(NSTableView *)o_tv
- willDisplayCell:(id)o_cell
- forTableColumn:(NSTableColumn *)o_tc
- row:(int)o_rows
+/* Required for drag & drop and reordering */
+- (BOOL)outlineView:(NSOutlineView *)outlineView writeItems:(NSArray *)items toPasteboard:(NSPasteboard *)pboard
{
- intf_thread_t * p_intf = [NSApp getIntf];
- playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- if ((p_playlist->i_groups) > 1 )
- {
- [o_cell setDrawsBackground: VLC_TRUE];
- switch ( p_playlist->pp_items[o_rows]->i_group % 8 )
- {
- case 1:
- /*white*/
- [o_cell setBackgroundColor: [NSColor colorWithDeviceRed:1.0 green:1.0 blue:1.0 alpha:1.0]];
- break;
-
- case 2:
- /*red*/
- [o_cell setBackgroundColor: [NSColor colorWithDeviceRed:1.0 green:0.76471 blue:0.76471 alpha:1.0]];
- break;
-
- case 3:
- /*dark blue*/
- [o_cell setBackgroundColor: [NSColor colorWithDeviceRed:0.76471 green:0.76471 blue:1.0 alpha:1.0]];
- break;
-
- case 4:
- /*orange*/
- [o_cell setBackgroundColor: [NSColor colorWithDeviceRed:1.0 green:0.89804 blue:0.76471 alpha:1.0]];
- break;
-
- case 5:
- /*purple*/
- [o_cell setBackgroundColor: [NSColor colorWithDeviceRed:1.0 green:0.76471 blue:1.0 alpha:1.0]];
- break;
-
- case 6:
- /*green*/
- [o_cell setBackgroundColor: [NSColor colorWithDeviceRed:0.76471 green:1.0 blue:0.76471 alpha:1.0]];
- break;
-
- case 7:
- /*light blue*/
- [o_cell setBackgroundColor: [NSColor colorWithDeviceRed:0.76471 green:1.0 blue:1.0 alpha:1.0]];
- break;
-
- case 0:
- /*yellow*/
- [o_cell setBackgroundColor: [NSColor colorWithDeviceRed:1.0 green:1.0 blue:0.76471 alpha:1.0]];
- break;
- }
-
- }
-vlc_object_release( p_playlist );
-}
-
-- (BOOL)tableView:(NSTableView *)o_tv
- writeRows:(NSArray*)o_rows
- toPasteboard:(NSPasteboard*)o_pasteboard
-{
- int i_rows = [o_rows count];
- NSArray *o_filenames = [NSArray array];
-
- [o_pasteboard declareTypes:[NSArray arrayWithObject:NSFilenamesPboardType] owner:self];
- [o_pasteboard setPropertyList:o_filenames forType:NSFilenamesPboardType];
- if ( i_rows == 1 )
- {
- i_moveRow = [[o_rows objectAtIndex:0]intValue];
- return YES;
- }
return NO;
}
-- (NSDragOperation)tableView:(NSTableView*)o_tv
- validateDrop:(id <NSDraggingInfo>)o_info
- proposedRow:(int)i_row
- proposedDropOperation:(NSTableViewDropOperation)o_operation
+- (NSDragOperation)outlineView:(NSOutlineView *)outlineView validateDrop:(id <NSDraggingInfo>)info proposedItem:(id)item proposedChildIndex:(int)index
{
- if ( o_operation == NSTableViewDropAbove )
- {
- if ( i_moveRow >= 0 )
- {
- if ( i_row != i_moveRow )
- {
- return NSDragOperationMove;
- }
- /* what if in the previous run, the row wasn't actually moved?
- then we can't drop new files on this location */
- return NSDragOperationNone;
- }
- return NSDragOperationGeneric;
- }
return NSDragOperationNone;
}
-- (BOOL)tableView:(NSTableView*)o_tv
- acceptDrop:(id <NSDraggingInfo>)o_info
- row:(int)i_proposed_row
- dropOperation:(NSTableViewDropOperation)o_operation
-{
- if ( i_moveRow >= 0 )
- {
- if (i_moveRow != -1 && i_proposed_row != -1)
- {
- intf_thread_t * p_intf = [NSApp getIntf];
- playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
-
- if( p_playlist == NULL )
- {
- i_moveRow = -1;
- return NO;
- }
-
- playlist_Move( p_playlist, i_moveRow, i_proposed_row );
-
- vlc_object_release( p_playlist );
- }
- [self playlistUpdated];
- i_moveRow = -1;
- return YES;
- }
- else
- {
- NSPasteboard * o_pasteboard;
- o_pasteboard = [o_info draggingPasteboard];
-
- if( [[o_pasteboard types] containsObject: NSFilenamesPboardType] )
- {
- int i;
- 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];
- }
- [self appendArray: o_array atPos: i_proposed_row enqueue:YES];
- return YES;
- }
- return NO;
- }
- [self updateRowSelection];
-}
-
/* Delegate method of NSWindow */
- (void)windowWillClose:(NSNotification *)aNotification
{
projects / vlc / blobdiff