/*****************************************************************************
* playlist.m: MacOS X interface module
*****************************************************************************
-* Copyright (C) 2002-2007 the VideoLAN team
+* Copyright (C) 2002-2008 the VideoLAN team
* $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 toggle buttons for the shuffle, repeat one, repeat all functions.
* 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
case NSEnterCharacter:
case NSCarriageReturnCharacter:
- [(VLCPlaylist *)[[VLCMain sharedInstance] getPlaylist]
- playItem:self];
+ [(VLCPlaylist *)[[VLCMain sharedInstance] getPlaylist] playItem:self];
break;
default:
p_item = (playlist_item_t *)[item pointerValue];
}
if( p_item )
- i_return = p_item->i_children;
+ i_return = p_item->i_children;
vlc_object_release( p_playlist );
- if( i_return <= 0 )
- i_return = 0;
-
- return i_return;
+ return i_return > 0 ? i_return : 0;
}
/* return the child at index for the Obj-C pointer item */ /* DONE */
if( o_value == nil )
{
+ msg_Warn( VLCIntf, "playlist item misses pointer value, adding one" );
o_value = [[NSValue valueWithPointer: p_return] retain];
- msg_Err( VLCIntf, "missing playlist item's pointer value" );
}
return o_value;
}
if( !EMPTY_STR( psz_title ) )
{
o_value = [NSString stringWithUTF8String: psz_title];
- if( o_value == NULL )
- o_value = [NSString stringWithCString: psz_title];
}
else
{
if( psz_name != NULL )
{
o_value = [NSString stringWithUTF8String: psz_name];
- if( o_value == NULL )
- o_value = [NSString stringWithCString: psz_name];
}
free( psz_name );
}
if( [[o_tc identifier] isEqualToString:@"2"] && !EMPTY_STR( psz_artist ) )
{
o_value = [NSString stringWithUTF8String: psz_artist];
- if( o_value == NULL )
- o_value = [NSString stringWithCString: psz_artist];
}
else if( [[o_tc identifier] isEqualToString:@"3"] )
{
@"VLCPlaylistItemPboardType", nil]];
[o_outline_view setIntercellSpacing: NSMakeSize (0.0, 1.0)];
- /* this uses private Apple API which works fine until 10.4,
- * but keep checking in the future!
+ /* This uses private Apple API which works fine until 10.4.
+ * 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];
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++ )
{
action: @selector(servicesChange:)
keyEquivalent: @""];
[o_lmi setTarget: self];
- [o_lmi setRepresentedObject: [NSString stringWithCString: ppsz_services[i]]];
+ [o_lmi setRepresentedObject: [NSString stringWithUTF8String: ppsz_services[i]]];
if( b_enabled ) [o_lmi setState: NSOnState];
/* Create the menu entries for the main menu */
action: @selector(servicesChange:)
keyEquivalent: @""];
[o_lmi setTarget: self];
- [o_lmi setRepresentedObject: [NSString stringWithCString: ppsz_services[i]]];
+ [o_lmi setRepresentedObject: [NSString stringWithUTF8String: ppsz_services[i]]];
if( b_enabled ) [o_lmi setState: NSOnState];
free( ppsz_services[i] );
free( ppsz_name );
vlc_object_release( p_playlist );
-
- //[self playlistUpdated];
}
- (void)searchfieldChanged:(NSNotification *)o_notification
[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: [NSString stringWithFormat:
- _NS("No items in the playlist")]];
+ [o_status_field setStringValue: _NS("No items in the playlist")];
-#if 0
- [o_search_button setTitle: _NS("Search")];
-#endif
[o_search_field setToolTip: _NS("Search in Playlist")];
[o_mi_addNode setTitle: _NS("Add Folder to Playlist")];
{
[o_array insertObject: [NSValue valueWithPointer: p_temp_item] atIndex: 0];
p_temp_item = p_temp_item->p_parent;
- /*for (i = 0 ; i < p_temp_item->i_parents ; i++)
- {
- if( p_temp_item->pp_parents[i]->i_view == i_current_view )
- {
- p_temp_item = p_temp_item->pp_parents[i]->p_parent;
- break;
- }
- }*/
}
for( j = 0; j < [o_array count] - 1; j++ )
}
- 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 );
/* update our info-panel to reflect the new item */
- (IBAction)savePlaylist:(id)sender
{
- intf_thread_t * p_intf = VLCIntf;
- playlist_t * p_playlist = pl_Yield( p_intf );
+ playlist_t * p_playlist = pl_Yield( VLCIntf );
NSSavePanel *o_save_panel = [NSSavePanel savePanel];
NSString * o_name = [NSString stringWithFormat: @"%@", _NS("Untitled")];
}
else
{
- msg_Dbg( p_intf, "preparse of nodes not yet implemented" );
+ msg_Dbg( p_intf, "preparsing nodes not implemented" );
}
}
}
if( [o_outline_view selectedRow] > -1 )
{
- p_item = [[o_outline_view itemAtRow: [o_outline_view selectedRow]]
- pointerValue];
+ p_item = [[o_outline_view itemAtRow: [o_outline_view selectedRow]] pointerValue];
}
else
/*If no item is selected, sort the whole playlist*/
{
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:nil range:NSMakeRange(0, [o_temp length]) ];
- [o_temp2 replaceOccurrencesOfString: @"s0" withString: @"" options:nil range:NSMakeRange(0, [o_temp2 length]) ];
- [o_temp2 replaceOccurrencesOfString: @"s1" withString: @"" options:nil range:NSMakeRange(0, [o_temp2 length]) ];
+ 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 stringWithCString:mounts[i_index].f_mntonname]];
+ o_name = [[NSFileManager defaultManager] displayNameAtPath: [NSString stringWithUTF8String:mounts[i_index].f_mntonname]];
}
}
}
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:nil range:NSMakeRange(0, [o_temp length]) ];
- [o_temp replaceOccurrencesOfString: @"s0" withString: @"" options:nil range:NSMakeRange(0, [o_temp length]) ];
- [o_temp replaceOccurrencesOfString: @"s1" withString: @"" options:nil range:NSMakeRange(0, [o_temp length]) ];
+ 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;
}
/* Recent documents menu */
o_true_file = [NSURL fileURLWithPath: o_uri];
- if( o_true_file != nil )
+ if( o_true_file != nil && (BOOL)config_GetInt( p_playlist, "macosx-recentitems" ) == YES )
{
[[NSDocumentController sharedDocumentController]
noteNewRecentDocumentURL: o_true_file];
[o_outline_dict setObject:o_value forKey:[NSString stringWithFormat:@"%p",
[o_value pointerValue]]];
+#ifdef DEBUG
msg_Dbg( VLCIntf, "adding item %p", [o_value pointerValue] );
+#endif
return o_value;
}
/* 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])
+ 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;
/* 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] || item == nil) )
+ 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 );
return NSDragOperationNone;
projects / vlc / blobdiff