case NSEnterCharacter:
case NSCarriageReturnCharacter:
- [(VLCPlaylist *)[[VLCMain sharedInstance] getPlaylist] playItem:self];
+ [(VLCPlaylist *)[[VLCMain sharedInstance] playlist] playItem:self];
break;
default:
[o_outline_view setAllowsEmptySelection: NO];
[o_outline_view expandItem: [o_outline_view itemAtRow:0]];
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
[self initStrings];
}
p_return = p_item->pp_children[index];
PL_UNLOCK;
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
o_value = [o_outline_dict objectForKey:[NSString stringWithFormat: @"%p", p_return]];
char ** ppsz_services = vlc_sd_GetNames( &ppsz_name );
if( !ppsz_services )
{
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
return;
}
free( ppsz_services );
free( ppsz_name );
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
}
- (void)searchfieldChanged:(NSNotification *)o_notification
// 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];
+ [[[[VLCMain sharedInstance] wizard] playlistWizard] reloadOutlineView];
+ [[[[VLCMain sharedInstance] bookmarks] dataTable] reloadData];
playlist_t *p_playlist = pl_Hold( VLCIntf );
[o_status_field setStringValue: _NS("1 item")];
}
PL_UNLOCK;
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
[self outlineViewSelectionDidChange: nil];
}
bool loop = var_GetBool( p_playlist, "loop" );
bool repeat = var_GetBool( p_playlist, "repeat" );
if( repeat )
- [[[VLCMain sharedInstance] getControls] repeatOne];
+ [[[VLCMain sharedInstance] controls] repeatOne];
else if( loop )
- [[[VLCMain sharedInstance] getControls] repeatAll];
+ [[[VLCMain sharedInstance] controls] repeatAll];
else
- [[[VLCMain sharedInstance] getControls] repeatOff];
+ [[[VLCMain sharedInstance] controls] repeatOff];
- [[[VLCMain sharedInstance] getControls] shuffle];
+ [[[VLCMain sharedInstance] controls] shuffle];
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
}
- (void)outlineViewSelectionDidChange:(NSNotification *)notification
if( [[VLCMain sharedInstance] isPlaylistCollapsed] == NO )
{
/* update our info-panel to reflect the new item, if we aren't collapsed */
- [[[VLCMain sharedInstance] getInfo] updatePanelWithItem:p_item->p_input];
+ [[[VLCMain sharedInstance] info] updatePanelWithItem:p_item->p_input];
}
}
}
if( p_node == p_item )
{
- vlc_object_release(p_playlist);
+ pl_Release( VLCIntf );
return YES;
}
if( p_node->i_children < 1)
{
- vlc_object_release(p_playlist);
+ pl_Release( VLCIntf );
return NO;
}
else if ( i == p_playlist->all_items.i_size - 1 )
{
if(!b_locked) PL_UNLOCK;
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
return NO;
}
}
if( p_temp_item == p_node )
{
if(!b_locked) PL_UNLOCK;
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
return YES;
}
}
if(!b_locked) PL_UNLOCK;
}
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
return NO;
}
p_playlist->p_local_category, "export-m3u" );
}
}
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
}
/* When called retrieves the selected outlineview row and plays that node or item */
}
playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, pl_Unlocked, p_node, p_item );
}
- vlc_object_release( p_playlist );
+ pl_Release( p_intf );
}
- (IBAction)revealItemInFinder:(id)sender
}
}
}
- vlc_object_release( p_playlist );
+ pl_Release( p_intf );
[self playlistUpdated];
}
playlist_AskForArtEnqueue( p_playlist, p_item->p_input, pl_Unlocked );
}
}
- vlc_object_release( p_playlist );
+ pl_Release( p_intf );
[self playlistUpdated];
}
[o_mi setState: playlist_IsServicesDiscoveryLoaded( p_playlist,
[o_string UTF8String] ) ? YES : NO];
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
[self playlistUpdated];
return;
}
PL_UNLOCK;
[self playlistUpdated];
- vlc_object_release( p_playlist );
+ pl_Release( p_intf );
}
- (IBAction)sortNodeByName:(id)sender
p_item->p_parent, i_mode, ORDER_NORMAL );
PL_UNLOCK;
}
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
[self playlistUpdated];
}
p_input = input_item_New( p_playlist, [o_uri fileSystemRepresentation], [o_name UTF8String] );
if( !p_input )
- return NULL;
+ {
+ pl_Release( p_intf );
+ return NULL;
+ }
if( o_options )
{
noteNewRecentDocumentURL: o_true_file];
}
- vlc_object_release( p_playlist );
+ pl_Release( p_intf );
return p_input;
}
PL_UNLOCK;
[self playlistUpdated];
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
}
- (void)appendNodeArray:(NSArray*)o_array inNode:(playlist_item_t *)p_node atPos:(int)i_position enqueue:(BOOL)b_enqueue
vlc_gc_decref( p_input );
}
[self playlistUpdated];
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
}
- (NSMutableArray *)subSearchItem:(playlist_item_t *)p_item
else if( p_selected_item == p_item->pp_children[i_current] &&
b_selected_item_met == YES )
{
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
return NULL;
}
else if( b_selected_item_met == YES &&
[o_current_author rangeOfString:[o_search_field
stringValue] options:NSCaseInsensitiveSearch].length ) )
{
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
/*Adds the parent items in the result array as well, so that we can
expand the tree*/
return [NSMutableArray arrayWithObject: [NSValue
p_item->pp_children[i_current]];
if( o_result != NULL )
{
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
[o_result insertObject: [NSValue valueWithPointer:
p_item->pp_children[i_current]] atIndex:0];
return o_result;
}
}
}
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
return NULL;
}
[o_outline_view selectRow:i_row byExtendingSelection: NO];
[o_outline_view scrollRowToVisible: i_row];
}
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
}
- (IBAction)recursiveExpandNode:(id)sender
sortable table column*/
if( !( o_tc == o_tc_name || o_tc == o_tc_author ) )
{
- vlc_object_release( p_playlist );
+ pl_Release( p_intf );
return;
}
playlist_RecursiveNodeSort( p_playlist, p_playlist->p_root_category, i_mode, i_type );
PL_UNLOCK;
- vlc_object_release( p_playlist );
+ pl_Release( p_intf );
[self playlistUpdated];
o_tc_sortColumn = o_tc;
{
[cell setFont: [[NSFontManager sharedFontManager] convertFont:[cell font] toNotHaveTrait:NSBoldFontMask]];
}
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
}
- (IBAction)addNode:(id)sender
{
- /* we have to create a new thread here because otherwise we would block the
- * interface since the interaction-stuff and this code would run in the same
- * thread */
- [NSThread detachNewThreadSelector: @selector(addNodeThreadedly)
- toTarget: self withObject:nil];
- [self playlistUpdated];
-}
-
-- (void)addNodeThreadedly
-{
- NSAutoreleasePool * ourPool = [[NSAutoreleasePool alloc] init];
-
- /* simply adds a new node to the end of the playlist */
playlist_t * p_playlist = pl_Hold( VLCIntf );
vlc_thread_set_priority( p_playlist, VLC_THREAD_PRIORITY_LOW );
- 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 )
- {
- playlist_NodeCreate( p_playlist, psz_name,
+ playlist_NodeCreate( p_playlist, _("Empty Folder"),
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];
-}
+ [self playlistUpdated];
+}
@end
@implementation VLCPlaylist (NSOutlineViewDataSource)
}
PL_UNLOCK;
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
[o_outline_dict setObject:o_value forKey:[NSString stringWithFormat:@"%p",
[o_value pointerValue]]];
[o_item pointerValue] == p_playlist->p_local_category ||
[o_item pointerValue] == p_playlist->p_ml_category )
{
- vlc_object_release(p_playlist);
+ pl_Release( VLCIntf );
return NO;
}
/* Fill the items and nodes to move in 2 different arrays */
@"VLCPlaylistItemPboardType", nil] owner: self];
[pboard setData:[NSData data] forType:@"VLCPlaylistItemPboardType"];
- vlc_object_release(p_playlist);
+ pl_Release( VLCIntf );
return YES;
}
if( index == NSOutlineViewDropOnItemIndex &&
((playlist_item_t *)[item pointerValue])->i_children == -1 )
{
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
return NSDragOperationNone;
}
}
/* Don't allow on drop on playlist root element's child */
if( !item && index != NSOutlineViewDropOnItemIndex)
{
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
return NSDragOperationNone;
}
if( !( ([self isItem: [item pointerValue] inNode: p_playlist->p_local_category checkItemExistence: NO] ||
( var_CreateGetBool( p_playlist, "media-library" ) && [self isItem: [item pointerValue] inNode: p_playlist->p_ml_category checkItemExistence: NO] ) ) || item == nil ) )
{
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
return NSDragOperationNone;
}
[[o_nodes_array objectAtIndex: i] pointerValue]
checkItemExistence: NO] )
{
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
return NSDragOperationNone;
}
}
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
return NSDragOperationMove;
}
/* Drop from the Finder */
else if( [[o_pasteboard types] containsObject: NSFilenamesPboardType] )
{
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
return NSDragOperationGeneric;
}
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
return NSDragOperationNone;
}
(This should never be true) */
if( p_new_parent->i_children < 0 )
{
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
return NO;
}
[o_outline_view selectRow: i_row byExtendingSelection: NO];
[o_outline_view scrollRowToVisible: i_row];
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
return YES;
}
[self appendNodeArray:o_array inNode: p_node
atPos:index enqueue:YES];
}
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
return YES;
}
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
return NO;
}
@end
projects / vlc / blobdiff