int i, c, i_row;
NSMutableArray *o_to_delete;
NSNumber *o_number;
-
+
playlist_t * p_playlist;
- intf_thread_t * p_intf = [NSApp getIntf];
+ intf_thread_t * p_intf = VLCIntf;
if( [[o_event characters] length] )
{
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 )
{
playlist_Stop( p_playlist );
}
[self reloadData];
break;
-
+
default:
[super keyDown: o_event];
break;
[o_table_view setIntercellSpacing: NSMakeSize (0.0, 1.0)];
[o_window setExcludedFromWindowsMenu: TRUE];
+
// [o_tbv_info setDataSource: [VLCInfoDataSource init]];
/* We need to check whether _defaultTableHeaderSortImage exists, since it
[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")];
[[o_tc_name headerCell] setStringValue:_NS("Name")];
- (void) tableView:(NSTableView*)o_tv
didClickTableColumn:(NSTableColumn *)o_tc
{
- intf_thread_t * p_intf = [NSApp getIntf];
+ intf_thread_t * p_intf = VLCIntf;
playlist_t *p_playlist =
(playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
}
if( o_tc_id == o_tc && !b_isSortDescending )
- {
+ {
playlist_SortID( p_playlist , ORDER_NORMAL );
- [o_table_view setIndicatorImage:o_ascendingSortingImage inTableColumn:o_tc];
+ [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];
+ [o_table_view setIndicatorImage:o_ascendingSortingImage inTableColumn:o_tc];
}
else if( o_tc_author == o_tc && !b_isSortDescending )
{
[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];
+ [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];
}
{
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
+- (BOOL)tableView:(NSTableView *)o_tv
shouldEditTableColumn:(NSTableColumn *)o_tc
row:(int)i_row
{
- (NSMenu *)menuForEvent:(NSEvent *)o_event
{
+ intf_thread_t * p_intf = VLCIntf;
+ playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
+
+ bool b_itemstate = FALSE;
+
NSPoint pt;
vlc_bool_t b_rows;
vlc_bool_t b_item_sel;
- pt = [o_table_view convertPoint: [o_event locationInWindow]
+ pt = [o_table_view convertPoint: [o_event locationInWindow]
fromView: nil];
b_item_sel = ( [o_table_view rowAtPoint: pt] != -1 &&
[o_table_view selectedRow] != -1 );
[o_mi_delete setEnabled: b_item_sel];
[o_mi_selectall setEnabled: b_rows];
[o_mi_info setEnabled: b_item_sel];
+ [o_mi_toggleItemsEnabled setEnabled: b_item_sel];
+ [o_mi_enableGroup setEnabled: b_item_sel];
+ [o_mi_disableGroup setEnabled: b_item_sel];
+
+ if (p_playlist)
+ {
+ b_itemstate = ([o_table_view selectedRow] > -1) ?
+ p_playlist->pp_items[[o_table_view selectedRow]]->b_enabled : FALSE;
+ vlc_object_release(p_playlist);
+ }
+
+ [o_mi_toggleItemsEnabled setState: b_itemstate];
return( o_ctx_menu );
}
- (IBAction)savePlaylist:(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 );
-
+
NSSavePanel *o_save_panel = [NSSavePanel savePanel];
NSString * o_name = [NSString stringWithFormat: @"%@.m3u", _NS("Untitled")];
[o_save_panel setTitle: _NS("Save Playlist")];
- (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 );
NSMutableArray *o_to_delete;
NSNumber *o_number;
- 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 );
{
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 );
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
+ * 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];
}
+- (IBAction)toggleItemsEnabled:(id)sender
+{
+ int i, c, i_row;
+ NSMutableArray *o_selected;
+ NSNumber *o_number;
+
+ 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;
+ }
+
+ o_selected = [NSMutableArray arrayWithArray:[[o_table_view selectedRowEnumerator] allObjects]];
+ c = (int)[o_selected count];
+
+ if (p_playlist->pp_items[[o_table_view selectedRow]]->b_enabled)
+ {
+ for( i = 0; i < c; i++ )
+ {
+ o_number = [o_selected lastObject];
+ i_row = [o_number intValue];
+ if( p_playlist->i_index == i_row && p_playlist->i_status )
+ {
+ playlist_Stop( p_playlist );
+ }
+ [o_selected removeObject: o_number];
+ playlist_Disable( p_playlist, i_row );
+ }
+ }
+ else
+ {
+ for( i = 0; i < c; i++ )
+ {
+ o_number = [o_selected lastObject];
+ i_row = [o_number intValue];
+ [o_selected removeObject: o_number];
+ playlist_Enable( p_playlist, i_row );
+ }
+ }
+ vlc_object_release( p_playlist );
+ [self playlistUpdated];
+}
+
+- (IBAction)enableGroup:(id)sender
+{
+ intf_thread_t * p_intf = VLCIntf;
+ playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
+
+ if (p_playlist)
+ {
+ playlist_EnableGroup(p_playlist,
+ p_playlist->pp_items[[o_table_view selectedRow]]->i_group);
+ vlc_object_release(p_playlist);
+ }
+}
+
+- (IBAction)disableGroup:(id)sender
+{
+ intf_thread_t * p_intf = VLCIntf;
+ playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
+
+ if (p_playlist)
+ {
+ playlist_DisableGroup(p_playlist,
+ p_playlist->pp_items[[o_table_view selectedRow]]->i_group);
+ vlc_object_release(p_playlist);
+ }
+}
+
- (IBAction)selectAll:(id)sender
{
[o_table_view selectAll: nil];
NSString *o_current_name;
NSString *o_current_author;
- 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 )
{
return;
}
else
{
- i_current = [o_table_view selectedRow];
+ i_current = [o_table_view selectedRow];
}
do
{
+ char *psz_temp;
i_current++;
vlc_mutex_lock( &p_playlist->object_lock );
- o_current_name = [NSString stringWithUTF8String:
+ 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") )];
+ psz_temp = playlist_GetInfo(p_playlist, i_current ,_("General"),_("Author") );
+ o_current_author = [NSString stringWithUTF8String: psz_temp];
+ free( psz_temp);
vlc_mutex_unlock( &p_playlist->object_lock );
- (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;
}
- (void)appendArray:(NSArray*)o_array atPos:(int)i_position enqueue:(BOOL)b_enqueue
{
int i_item;
- 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 );
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 )
{
/* 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]);
}
}
/* Add the item */
- i_new_id = playlist_AddExt( p_playlist, [o_uri fileSystemRepresentation],
- [o_name UTF8String], i_mode,
+ 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
+ /* 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];
+ noteNewRecentDocumentURL: o_true_file];
}
-
+
if( i_item == 0 && !b_enqueue )
{
playlist_Goto( p_playlist, playlist_GetPositionById( p_playlist, i_new_id ) );
- (void)playlistUpdated
{
vlc_value_t val1, val2;
- 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 )
{
int i_row;
- 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 );
return [o_table_view selectedRow];
}
+- (NSMutableArray *)selectedPlaylistItemsList
+{
+ return [NSMutableArray arrayWithArray:[[o_table_view
+ selectedRowEnumerator] allObjects]];
+
+}
+
+- (void)deleteGroup:(int)i_id
+{
+ intf_thread_t * p_intf = VLCIntf;
+ playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
+ int i;
+ int i_newgroup = 0;
+
+ if (p_playlist)
+ {
+
+ /*first, change the group of all the items that belong to the group to
+ delete. Change it to the group with the smallest id.*/
+
+ /*search for the group with the smallest id*/
+
+ if(p_playlist->i_groups == 1)
+ {
+ msg_Warn(p_playlist,"Trying to delete last group, cancelling");
+ vlc_object_release(p_playlist);
+ return;
+ }
+
+ for (i = 0 ; i<p_playlist->i_groups ; i++)
+ {
+ if((i_newgroup == 0 || i_newgroup > p_playlist->pp_groups[i]->i_id)
+ && p_playlist->pp_groups[i]->i_id != i_id)
+ {
+ i_newgroup = p_playlist->pp_groups[i]->i_id;
+ }
+ }
+
+ vlc_mutex_lock( &p_playlist->object_lock );
+
+ for (i = 0; i < p_playlist->i_size;i++)
+ {
+ if (p_playlist->pp_items[i]->i_group == i_id)
+ {
+ vlc_mutex_lock(&p_playlist->pp_items[i]->input.lock);
+ p_playlist->pp_items[i]->i_group = i_newgroup;
+ vlc_mutex_unlock(&p_playlist->pp_items[i]->input.lock);
+ }
+ }
+ vlc_mutex_unlock( &p_playlist->object_lock );
+
+ playlist_DeleteGroup( p_playlist, i_id );
+
+ vlc_object_release(p_playlist);
+ [self playlistUpdated];
+ }
+}
+
+- (NSColor *)getColor:(int)i_group
+{
+ NSColor * o_color = nil;
+ switch ( i_group % 8 )
+ {
+ case 1:
+ /*white*/
+ o_color = [NSColor colorWithDeviceRed:1.0 green:1.0 blue:1.0 alpha:1.0];
+ break;
+
+ case 2:
+ /*red*/
+ o_color = [NSColor colorWithDeviceRed:1.0 green:0.76471 blue:0.76471 alpha:1.0];
+ break;
+
+ case 3:
+ /*dark blue*/
+ o_color = [NSColor colorWithDeviceRed:0.76471 green:0.76471 blue:1.0 alpha:1.0];
+ break;
+
+ case 4:
+ /*orange*/
+ o_color = [NSColor colorWithDeviceRed:1.0 green:0.89804 blue:0.76471 alpha:1.0];
+ break;
+
+ case 5:
+ /*purple*/
+ o_color = [NSColor colorWithDeviceRed:1.0 green:0.76471 blue:1.0 alpha:1.0];
+ break;
+
+ case 6:
+ /*green*/
+ o_color = [NSColor colorWithDeviceRed:0.76471 green:1.0 blue:0.76471 alpha:1.0];
+ break;
+
+ case 7:
+ /*light blue*/
+ o_color = [NSColor colorWithDeviceRed:0.76471 green:1.0 blue:1.0 alpha:1.0];
+ break;
+
+ case 0:
+ /*yellow*/
+ o_color = [NSColor colorWithDeviceRed:1.0 green:1.0 blue:0.76471 alpha:1.0];
+ break;
+ }
+ return o_color;
+}
+
@end
@implementation VLCPlaylist (NSTableDataSource)
- (int)numberOfRowsInTableView:(NSTableView *)o_tv
{
int i_count = 0;
- 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 );
return( i_count );
}
-- (id)tableView:(NSTableView *)o_tv
- objectValueForTableColumn:(NSTableColumn *)o_tc
+- (id)tableView:(NSTableView *)o_tv
+ objectValueForTableColumn:(NSTableColumn *)o_tc
row:(int)i_row
{
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 );
else if( [[o_tc identifier] isEqualToString:@"1"] )
{
vlc_mutex_lock( &p_playlist->object_lock );
- o_value = [NSString stringWithUTF8String:
+ o_value = [NSString stringWithUTF8String:
p_playlist->pp_items[i_row]->input.psz_name];
if( o_value == NULL )
- o_value = [NSString stringWithCString:
+ o_value = [NSString stringWithCString:
p_playlist->pp_items[i_row]->input.psz_name];
vlc_mutex_unlock( &p_playlist->object_lock );
}
else if( [[o_tc identifier] isEqualToString:@"2"] )
{
+ char *psz_temp;
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") )];
+ psz_temp = playlist_GetInfo( p_playlist, i_row ,_("General"),_("Author") );
vlc_mutex_unlock( &p_playlist->object_lock );
+
+ 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"] )
{
}
- (void)tableView:(NSTableView *)o_tv
- willDisplayCell:(id)o_cell
- forTableColumn:(NSTableColumn *)o_tc
- row:(int)o_rows
+ willDisplayCell:(id)o_cell
+ forTableColumn:(NSTableColumn *)o_tc
+ row:(int)i_rows
{
- 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->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;
+ if (p_playlist)
+ {
+ if ((p_playlist->i_groups) > 1 )
+ {
+ [o_cell setDrawsBackground: VLC_TRUE];
+ [o_cell setBackgroundColor:
+ [self getColor:p_playlist->pp_items[i_rows]->i_group]];
+ }
+ else
+ {
+ [o_cell setDrawsBackground: VLC_FALSE];
+ }
- case 0:
- /*yellow*/
- [o_cell setBackgroundColor: [NSColor colorWithDeviceRed:1.0 green:1.0 blue:0.76471 alpha:1.0]];
- break;
- }
-
+ if (!p_playlist->pp_items[i_rows]->b_enabled)
+ {
+ [o_cell setTextColor: [NSColor colorWithDeviceRed:0.3686 green:0.3686 blue:0.3686 alpha:1.0]];
+ }
+ else
+ {
+ [o_cell setTextColor:[NSColor colorWithDeviceRed:0.0 green:0.0 blue:0.0 alpha:1.0]];
+ }
+ vlc_object_release( p_playlist );
}
-vlc_object_release( p_playlist );
}
- (BOOL)tableView:(NSTableView *)o_tv
writeRows:(NSArray*)o_rows
- toPasteboard:(NSPasteboard*)o_pasteboard
+ 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 )
- (NSDragOperation)tableView:(NSTableView*)o_tv
validateDrop:(id <NSDraggingInfo>)o_info
proposedRow:(int)i_row
- proposedDropOperation:(NSTableViewDropOperation)o_operation
+ proposedDropOperation:(NSTableViewDropOperation)o_operation
{
if ( o_operation == NSTableViewDropAbove )
{
{
return NSDragOperationMove;
}
- /* what if in the previous run, the row wasn't actually moved?
+ /* what if in the previous run, the row wasn't actually moved?
then we can't drop new files on this location */
return NSDragOperationNone;
}
- (BOOL)tableView:(NSTableView*)o_tv
acceptDrop:(id <NSDraggingInfo>)o_info
row:(int)i_proposed_row
- dropOperation:(NSTableViewDropOperation)o_operation
+ dropOperation:(NSTableViewDropOperation)o_operation
{
if ( i_moveRow >= 0 )
{
if (i_moveRow != -1 && i_proposed_row != -1)
{
- 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 )
{
i_moveRow = -1;
return NO;
}
-
- playlist_Move( p_playlist, i_moveRow, i_proposed_row );
-
+
+ playlist_Move( p_playlist, i_moveRow, i_proposed_row );
+
vlc_object_release( p_playlist );
}
[self playlistUpdated];
{
NSPasteboard * o_pasteboard;
o_pasteboard = [o_info draggingPasteboard];
-
+
if( [[o_pasteboard types] containsObject: NSFilenamesPboardType] )
{
int i;
projects / vlc / blobdiff