/*****************************************************************************
* playlist.m: MacOS X interface module
*****************************************************************************
-* Copyright (C) 2002-2009 VLC authors and VideoLAN
+* Copyright (C) 2002-2012 VLC authors and VideoLAN
* $Id$
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Derk-Jan Hartman <hartman at videola/n dot org>
* Benjamin Pracht <bigben at videolab dot org>
+ * Felix Paul Kühne <fkuehne at videolan dot org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
/* TODO
* add 'icons' for different types of nodes? (http://www.cocoadev.com/index.pl?IconAndTextInTableCell)
* 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
*/
#import "playlist.h"
#import "controls.h"
#import "misc.h"
+#import "open.h"
+#import "MainMenu.h"
#include <vlc_keys.h>
-#import <vlc_services_discovery.h>
#import <vlc_osd.h>
#import <vlc_interface.h>
#include <vlc_url.h>
-
/*****************************************************************************
* VLCPlaylistView implementation
*****************************************************************************/
- (NSMenu *)menuForEvent:(NSEvent *)o_event
{
- return( [[self delegate] menuForEvent: o_event] );
+ return( [(VLCPlaylist *)[self delegate] menuForEvent: o_event] );
}
- (void)keyDown:(NSEvent *)o_event
case NSDeleteFunctionKey:
case NSDeleteCharFunctionKey:
case NSBackspaceCharacter:
- [[self delegate] deleteItem:self];
+ [(VLCPlaylist *)[self delegate] deleteItem:self];
break;
case NSEnterCharacter:
case NSCarriageReturnCharacter:
- [(VLCPlaylist *)[[VLCMain sharedInstance] playlist] playItem:self];
+ [(VLCPlaylist *)[[VLCMain sharedInstance] playlist] playItem:nil];
break;
default:
}
}
+- (BOOL)validateMenuItem:(NSMenuItem *)item
+{
+ if (([self numberOfSelectedRows] >= 1 && [item action] == @selector(delete:)) || [item action] == @selector(selectAll:))
+ return YES;
+
+ return NO;
+}
+
+- (BOOL) acceptsFirstResponder
+{
+ return YES;
+}
+
+- (BOOL) becomeFirstResponder
+{
+ [self setNeedsDisplay:YES];
+ return YES;
+}
+
+- (BOOL) resignFirstResponder
+{
+ [self setNeedsDisplay:YES];
+ return YES;
+}
+
+- (IBAction)delete:(id)sender
+{
+ [[[VLCMain sharedInstance] playlist] deleteItem: sender];
+}
+
@end
/*****************************************************************************
*****************************************************************************/
@implementation VLCPlaylistCommon
++ (void)initialize{
+ NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+ NSMutableArray * o_columnArray = [[NSMutableArray alloc] init];
+ [o_columnArray addObject: [NSArray arrayWithObjects: TITLE_COLUMN, [NSNumber numberWithFloat: 190.], nil]];
+ [o_columnArray addObject: [NSArray arrayWithObjects: ARTIST_COLUMN, [NSNumber numberWithFloat: 95.], nil]];
+ [o_columnArray addObject: [NSArray arrayWithObjects: DURATION_COLUMN, [NSNumber numberWithFloat: 95.], nil]];
+ NSDictionary *appDefaults = [NSDictionary dictionaryWithObject:[NSArray arrayWithArray:o_columnArray] forKey:@"PlaylistColumnSelection"];
+
+ [defaults registerDefaults:appDefaults];
+ [o_columnArray release];
+}
+
- (id)init
{
+ playlist_t * p_playlist = pl_Get( VLCIntf );
+ p_current_root_item = p_playlist->p_local_category;
+
self = [super init];
if ( self != nil )
{
}
return self;
}
+
- (void)awakeFromNib
{
playlist_t * p_playlist = pl_Get( VLCIntf );
[o_outline_view setAllowsEmptySelection: NO];
[o_outline_view expandItem: [o_outline_view itemAtRow:0]];
- [o_outline_view_other setTarget: self];
+ [o_outline_view_other setTarget: self];
[o_outline_view_other setDelegate: self];
[o_outline_view_other setDataSource: self];
[o_outline_view_other setAllowsEmptySelection: NO];
- [self initStrings];
+ [[o_tc_name_other headerCell] setStringValue:_NS("Name")];
+ [[o_tc_author_other headerCell] setStringValue:_NS("Author")];
+ [[o_tc_duration_other headerCell] setStringValue:_NS("Duration")];
+
+ NSArray * o_columnArray = [[NSUserDefaults standardUserDefaults] arrayForKey:@"PlaylistColumnSelection"];
+ NSUInteger count = [o_columnArray count];
+
+ id o_menu = [[VLCMain sharedInstance] mainMenu];
+ NSString * o_column;
+ for (NSUInteger i = 0; i < count; i++)
+ {
+ o_column = [[o_columnArray objectAtIndex:i] objectAtIndex:0];
+ if ([o_column isEqualToString:@"status"])
+ continue;
+
+ [self setColumn: o_column state: NSOnState];
+ [o_menu setPlaylistColumnTableState: NSOnState forColumn: o_column];
+ [[o_outline_view tableColumnWithIdentifier: o_column] setWidth: [[[o_columnArray objectAtIndex:i] objectAtIndex:1] floatValue]];
+ }
+
+ [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(applicationWillTerminate:) name: NSApplicationWillTerminateNotification object: nil];
}
-- (void)initStrings
+- (void)applicationWillTerminate:(NSNotification *)notification
{
- [[o_tc_name headerCell] setStringValue:_NS("Name")];
- [[o_tc_author headerCell] setStringValue:_NS("Author")];
- [[o_tc_duration headerCell] setStringValue:_NS("Duration")];
+ /* let's make sure we save the correct widths and positions, since this likely changed since the last time the user played with the column selection */
+ [self saveTableColumns];
+}
- [[o_tc_name_other headerCell] setStringValue:_NS("Name")];
- [[o_tc_author_other headerCell] setStringValue:_NS("Author")];
- [[o_tc_duration_other headerCell] setStringValue:_NS("Duration")];
+- (void)setPlaylistRoot: (playlist_item_t *)root_item
+{
+ p_current_root_item = root_item;
+ [o_outline_view reloadData];
+ [o_outline_view_other reloadData];
}
-- (void)swapPlaylists:(id)newList
+- (playlist_item_t *)currentPlaylistRoot
{
- if(newList != o_outline_view)
- {
- id o_outline_view_temp = o_outline_view;
- id o_tc_author_temp = o_tc_author;
- id o_tc_duration_temp = o_tc_duration;
- id o_tc_name_temp = o_tc_name;
- o_outline_view = o_outline_view_other;
- o_tc_author = o_tc_author_other;
- o_tc_duration = o_tc_duration_other;
- o_tc_name = o_tc_name_other;
- o_outline_view_other = o_outline_view_temp;
- o_tc_author_other = o_tc_author_temp;
- o_tc_duration_other = o_tc_duration_temp;
- o_tc_name_other = o_tc_name_temp;
- }
+ return p_current_root_item;
}
- (NSOutlineView *)outlineView
pointerValue];
}
+- (void)setColumn: (NSString *)o_column state: (NSInteger)i_state
+{
+ NSTableColumn * o_work_tc;
+
+ if (i_state == NSOnState)
+ {
+ o_work_tc = [[NSTableColumn alloc] initWithIdentifier: o_column];
+ [o_work_tc setEditable: NO];
+ [[o_work_tc dataCell] setFont: [NSFont controlContentFontOfSize:11.]];
+
+ /* we cannot use a makro here, because gettext isn't clever enough for that */
+ if ([o_column isEqualToString: TRACKNUM_COLUMN])
+ {
+ [o_work_tc setMaxWidth: 20.];
+ [[o_work_tc headerCell] setStringValue: @"#"];
+ }
+ else if ([o_column isEqualToString: TITLE_COLUMN])
+ {
+ [[o_work_tc headerCell] setStringValue: _NS("Name")];
+ [o_work_tc setResizingMask: NSTableColumnAutoresizingMask | NSTableColumnUserResizingMask];
+ }
+ else if ([o_column isEqualToString: ARTIST_COLUMN])
+ [[o_work_tc headerCell] setStringValue: _NS("Author")];
+ else if ([o_column isEqualToString: DURATION_COLUMN])
+ [[o_work_tc headerCell] setStringValue: _NS("Duration")];
+ else if ([o_column isEqualToString: GENRE_COLUMN])
+ [[o_work_tc headerCell] setStringValue: _NS("Genre")];
+ else if ([o_column isEqualToString: ALBUM_COLUMN])
+ [[o_work_tc headerCell] setStringValue: _NS("Album")];
+ else if ([o_column isEqualToString: DESCRIPTION_COLUMN])
+ [[o_work_tc headerCell] setStringValue: _NS("Description")];
+ else if ([o_column isEqualToString: DATE_COLUMN])
+ [[o_work_tc headerCell] setStringValue: _NS("Date")];
+ else if ([o_column isEqualToString: LANGUAGE_COLUMN])
+ [[o_work_tc headerCell] setStringValue: _NS("Language")];
+
+ [o_outline_view addTableColumn: o_work_tc];
+ [o_work_tc release];
+ [o_outline_view reloadData];
+ [o_outline_view setNeedsDisplay: YES];
+ }
+ else
+ [o_outline_view removeTableColumn: [o_outline_view tableColumnWithIdentifier: o_column]];
+
+ [self saveTableColumns];
+}
+
+- (void)saveTableColumns
+{
+ NSMutableArray * o_arrayToSave = [[NSMutableArray alloc] init];
+ NSArray * o_columns = [o_outline_view tableColumns];
+ NSUInteger count = [o_columns count];
+ NSTableColumn * o_currentColumn;
+ for (NSUInteger i = 0; i < count; i++)
+ {
+ o_currentColumn = [o_columns objectAtIndex: i];
+ [o_arrayToSave addObject: [NSArray arrayWithObjects: [o_currentColumn identifier], [NSNumber numberWithFloat: [o_currentColumn width]], nil]];
+ }
+ [[NSUserDefaults standardUserDefaults] setObject: o_arrayToSave forKey:@"PlaylistColumnSelection"];
+ [o_arrayToSave release];
+}
+
@end
@implementation VLCPlaylistCommon (NSOutlineViewDataSource)
-
/* return the number of children for Obj-C pointer item */ /* DONE */
- (NSInteger)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item
{
PL_LOCK;
if( !item )
- p_item = p_playlist->p_root_category;
+ {
+ p_item = p_current_root_item;
+ }
else
p_item = (playlist_item_t *)[item pointerValue];
if( item == nil )
{
/* root object */
- p_item = p_playlist->p_root_category;
+ p_item = p_current_root_item;
}
else
{
if( item == nil )
{
/* root object */
- if( p_playlist->p_root_category )
+ if( p_current_root_item )
{
- i_return = p_playlist->p_root_category->i_children;
+ i_return = p_current_root_item->i_children;
}
}
else
- (id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTableColumn *)o_tc byItem:(id)item
{
id o_value = nil;
+ char * psz_value;
playlist_item_t *p_item;
/* For error handling */
}
attempted_reload = NO;
+ NSString * o_identifier = [o_tc identifier];
- if( [[o_tc identifier] isEqualToString:@"name"] )
+ if( [o_identifier isEqualToString:TRACKNUM_COLUMN] )
+ {
+ psz_value = input_item_GetTrackNumber( p_item->p_input ); \
+ if (psz_value) { \
+ o_value = [NSString stringWithUTF8String: psz_value]; \
+ free( psz_value ); \
+ }
+ }
+ else if( [o_identifier isEqualToString:TITLE_COLUMN] )
{
/* sanity check to prevent the NSString class from crashing */
char *psz_title = input_item_GetTitleFbName( p_item->p_input );
free( psz_title );
}
}
- else if( [[o_tc identifier] isEqualToString:@"artist"] )
+ else if( [o_identifier isEqualToString:ARTIST_COLUMN] )
{
- char *psz_artist = input_item_GetArtist( p_item->p_input );
- if( psz_artist )
- o_value = [NSString stringWithUTF8String: psz_artist];
- free( psz_artist );
+ psz_value = input_item_GetArtist( p_item->p_input ); \
+ if (psz_value) { \
+ o_value = [NSString stringWithUTF8String: psz_value]; \
+ free( psz_value ); \
+ }
}
- else if( [[o_tc identifier] isEqualToString:@"duration"] )
+ else if( [o_identifier isEqualToString:@"duration"] )
{
char psz_duration[MSTRTIME_MAX_SIZE];
mtime_t dur = input_item_GetDuration( p_item->p_input );
else
o_value = @"--:--";
}
- else if( [[o_tc identifier] isEqualToString:@"status"] )
+ else if( [o_identifier isEqualToString:GENRE_COLUMN] )
+ {
+ psz_value = input_item_GetGenre( p_item->p_input ); \
+ if (psz_value) { \
+ o_value = [NSString stringWithUTF8String: psz_value]; \
+ free( psz_value ); \
+ }
+ }
+ else if( [o_identifier isEqualToString:ALBUM_COLUMN] )
+ {
+ psz_value = input_item_GetAlbum( p_item->p_input ); \
+ if (psz_value) { \
+ o_value = [NSString stringWithUTF8String: psz_value]; \
+ free( psz_value ); \
+ }
+ }
+ else if( [o_identifier isEqualToString:DESCRIPTION_COLUMN] )
+ {
+ psz_value = input_item_GetDescription( p_item->p_input ); \
+ if (psz_value) { \
+ o_value = [NSString stringWithUTF8String: psz_value]; \
+ free( psz_value ); \
+ }
+ }
+ else if( [o_identifier isEqualToString:DATE_COLUMN] )
+ {
+ psz_value = input_item_GetDate( p_item->p_input ); \
+ if (psz_value) { \
+ o_value = [NSString stringWithUTF8String: psz_value]; \
+ free( psz_value ); \
+ }
+ }
+ else if( [o_identifier isEqualToString:LANGUAGE_COLUMN] )
+ {
+ psz_value = input_item_GetLanguage( p_item->p_input ); \
+ if (psz_value) { \
+ o_value = [NSString stringWithUTF8String: psz_value]; \
+ free( psz_value ); \
+ }
+ }
+ else if( [o_identifier isEqualToString:@"status"] )
{
if( input_item_HasErrorWhenReading( p_item->p_input ) )
{
[o_value setSize: NSMakeSize(16,16)];
}
}
+
return o_value;
}
o_descendingSortingImage = [[NSOutlineView class] _defaultTableHeaderReverseSortImage];
o_tc_sortColumn = nil;
-
- char ** ppsz_name;
- char ** ppsz_services = vlc_sd_GetNames( VLCIntf, &ppsz_name, NULL );
- if( !ppsz_services )
- return;
-
- for( i = 0; ppsz_services[i]; i++ )
- {
- bool b_enabled;
- NSMenuItem *o_lmi;
-
- char * name = ppsz_name[i] ? ppsz_name[i] : ppsz_services[i];
- /* Check whether to enable these menuitems */
- b_enabled = playlist_IsServicesDiscoveryLoaded( p_playlist, ppsz_services[i] );
-
- /* Create the menu entries used in the playlist menu */
- o_lmi = [[o_mi_services submenu] addItemWithTitle:
- [NSString stringWithUTF8String: name]
- action: @selector(servicesChange:)
- keyEquivalent: @""];
- [o_lmi setTarget: self];
- [o_lmi setRepresentedObject: [NSString stringWithUTF8String: ppsz_services[i]]];
- if( b_enabled ) [o_lmi setState: NSOnState];
-
- /* Create the menu entries for the main menu */
- o_lmi = [[o_mm_mi_services submenu] addItemWithTitle:
- [NSString stringWithUTF8String: name]
- action: @selector(servicesChange:)
- keyEquivalent: @""];
- [o_lmi setTarget: self];
- [o_lmi setRepresentedObject: [NSString stringWithUTF8String: ppsz_services[i]]];
- if( b_enabled ) [o_lmi setState: NSOnState];
-
- free( ppsz_services[i] );
- free( ppsz_name[i] );
- }
- free( ppsz_services );
- free( ppsz_name );
}
- (void)searchfieldChanged:(NSNotification *)o_notification
- (void)initStrings
{
- [super initStrings];
-
[o_mi_save_playlist setTitle: _NS("Save Playlist...")];
[o_mi_play setTitle: _NS("Play")];
[o_mi_delete setTitle: _NS("Delete")];
[[o_mm_mi_revealInFinder menu] setAutoenablesItems: NO];
[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_mm_mi_services setTitle: _NS("Services discovery")];
[o_search_field setToolTip: _NS("Search in Playlist")];
[o_search_field_other setToolTip: _NS("Search in Playlist")];
[[o_save_accessory_popup itemAtIndex:2] setTitle: _NS("HTML Playlist")];
}
-- (void)swapPlaylists:(id)newList
-{
- if(newList != o_outline_view)
- {
- id o_search_field_temp = o_search_field;
- o_search_field = o_search_field_other;
- o_search_field_other = o_search_field_temp;
- [super swapPlaylists:newList];
- [self playlistUpdated];
- }
-}
-
- (void)playlistUpdated
{
/* Clear indications of any existing column sorting */
[[[[VLCMain sharedInstance] bookmarks] dataTable] reloadData];
[self outlineViewSelectionDidChange: nil];
+ [[VLCMain sharedInstance] updateMainWindow];
}
- (void)outlineViewSelectionDidChange:(NSNotification *)notification
[o_outline_view expandItem: o_item];
}
}
+
+ id o_item = [o_outline_dict objectForKey:[NSString stringWithFormat: @"%p", p_item]];
+ NSInteger i_index = [o_outline_view rowForItem:o_item];
+ [o_outline_view selectRowIndexes:[NSIndexSet indexSetWithIndex:i_index] byExtendingSelection:NO];
+ [o_outline_view setNeedsDisplay:YES];
}
/* Check if p_item is a child of p_node recursively. We need to check the item
playlist_item_t *p_item;
playlist_item_t *p_node = NULL;
+ // ignore clicks on column header when handling double action
+ if( sender != nil && [o_outline_view clickedRow] == -1 )
+ return;
+
p_item = [[o_outline_view itemAtRow:[o_outline_view selectedRow]] pointerValue];
PL_LOCK;
[self playlistUpdated];
}
-- (IBAction)servicesChange:(id)sender
-{
- NSMenuItem *o_mi = (NSMenuItem *)sender;
- NSString *o_string = [o_mi representedObject];
- playlist_t * p_playlist = pl_Get( VLCIntf );
- if( !playlist_IsServicesDiscoveryLoaded( p_playlist, [o_string UTF8String] ) )
- playlist_ServicesDiscoveryAdd( p_playlist, [o_string UTF8String] );
- else
- playlist_ServicesDiscoveryRemove( p_playlist, [o_string UTF8String] );
-
- [o_mi setState: playlist_IsServicesDiscoveryLoaded( p_playlist,
- [o_string UTF8String] ) ? YES : NO];
-
- [self playlistUpdated];
- return;
-}
-
- (IBAction)selectAll:(id)sender
{
[o_outline_view selectAll: nil];
p_playlist = pl_Get( p_intf );
NSUInteger indexes[i_count];
+ if (i_count == [o_outline_view numberOfRows])
+ {
+#ifndef NDEBUG
+ msg_Dbg( p_intf, "user selected entire list, deleting current playlist root instead of individual items" );
+#endif
+ PL_LOCK;
+ playlist_NodeDelete( p_playlist, [self currentPlaylistRoot], true, false );
+ PL_UNLOCK;
+ [self playlistUpdated];
+ return;
+ }
[o_selected_indexes getIndexes:indexes maxCount:i_count inIndexRange:nil];
for (int i = 0; i < i_count; i++)
{
// if current item is in selected node and is playing then stop playlist
playlist_Control(p_playlist, PLAYLIST_STOP, pl_Locked );
- playlist_NodeDelete( p_playlist, p_item, true, false );
+ playlist_NodeDelete( p_playlist, p_item, true, false );
}
else
playlist_DeleteFromInput( p_playlist, p_item->p_input, pl_Locked );
else
/*If no item is selected, sort the whole playlist*/
{
- p_item = p_playlist->p_root_category;
+ p_item = [self currentPlaylistRoot];
}
PL_LOCK;
playlist_t * p_playlist = pl_Get( p_intf );
input_item_t *p_input;
- BOOL b_rem = FALSE, b_dir = FALSE;
- NSString *o_uri, *o_name;
+ BOOL b_rem = FALSE, b_dir = FALSE, b_writable = FALSE;
+ NSString *o_uri, *o_name, *o_path;
+ NSURL * o_nsurl;
NSArray *o_options;
NSURL *o_true_file;
/* Get the item */
o_uri = (NSString *)[o_one_item objectForKey: @"ITEM_URL"];
+ o_nsurl = [NSURL URLWithString: o_uri];
+ o_path = [o_nsurl path];
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 )
+ if( [[NSFileManager defaultManager] fileExistsAtPath:o_path isDirectory:&b_dir] && b_dir &&
+ [[NSWorkspace sharedWorkspace] getFileSystemInfoForPath:o_path isRemovable: &b_rem
+ isWritable:&b_writable isUnmountable:NULL description:NULL type:NULL] && b_rem && !b_writable && [o_nsurl isFileURL] )
{
- int i_count;
- struct statfs *mounts = NULL;
- i_count = getmntinfo (&mounts, MNT_NOWAIT);
- /* getmntinfo returns a pointer to static data. Do not free. */
- for( int i_index = 0 ; i_index < i_count; i_index++ )
+ id o_vlc_open = [[VLCMain sharedInstance] open];
+
+ char *diskType = [o_vlc_open getVolumeTypeFromMountPath: o_path];
+ msg_Dbg( p_intf, "detected optical media of type '%s' in the file input", diskType );
+
+ if (diskType == kVLCMediaDVD)
{
- NSMutableString *o_temp, *o_temp2;
- o_temp = [NSMutableString stringWithString: o_uri];
- 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 stringWithUTF8String:mounts[i_index].f_mntonname]];
- }
+ o_uri = [NSString stringWithFormat: @"dvdnav://%@", [o_vlc_open getBSDNodeFromMountPath: o_path]];
+ }
+ else if (diskType == kVLCMediaVideoTSFolder)
+ {
+ o_uri = [NSString stringWithFormat: @"dvdnav://%@", o_path];
+ }
+ else if (diskType == kVLCMediaAudioCD)
+ {
+ o_uri = [NSString stringWithFormat: @"cdda://%@", [o_vlc_open getBSDNodeFromMountPath: o_path]];
+ }
+ else if (diskType == kVLCMediaVCD)
+ {
+ o_uri = [NSString stringWithFormat: @"vcd://%@#0:0", [o_vlc_open getBSDNodeFromMountPath: o_path]];
+ }
+ else if (diskType == kVLCMediaSVCD)
+ {
+ o_uri = [NSString stringWithFormat: @"vcd://%@@0:0", [o_vlc_open getBSDNodeFromMountPath: o_path]];
+ }
+ else if (diskType == kVLCMediaBD || diskType == kVLCMediaBDMVFolder)
+ {
+ o_uri = [NSString stringWithFormat: @"bluray://%@", o_path];
+ }
+ else
+ {
+ msg_Warn( VLCIntf, "unknown disk type, treating %s as regular input", [o_path UTF8String] );
}
- }
- 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 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;
+ p_input = input_item_New( [o_uri UTF8String], [[[NSFileManager defaultManager] displayNameAtPath: o_path] UTF8String] );
}
+ else
+ p_input = input_item_New( [o_uri fileSystemRepresentation], o_name ? [o_name UTF8String] : NULL );
- p_input = input_item_New( [o_uri fileSystemRepresentation], o_name ? [o_name UTF8String] : NULL );
if( !p_input )
return NULL;
}
/* Recent documents menu */
- o_true_file = [NSURL URLWithString: o_uri];
- if( o_true_file != nil && (BOOL)config_GetInt( p_playlist, "macosx-recentitems" ) == YES )
+ if( o_nsurl != nil && (BOOL)config_GetInt( p_playlist, "macosx-recentitems" ) == YES )
{
- [[NSDocumentController sharedDocumentController]
- noteNewRecentDocumentURL: o_true_file];
+ [[NSDocumentController sharedDocumentController] noteNewRecentDocumentURL: o_nsurl];
}
return p_input;
}
{
playlist_t * p_playlist = pl_Get( VLCIntf );
NSUInteger count = [o_array count];
+ BOOL b_usingPlaylist;
+ if ([self currentPlaylistRoot] == p_playlist->p_ml_category)
+ b_usingPlaylist = NO;
+ else
+ b_usingPlaylist = YES;
PL_LOCK;
for( NSUInteger i_item = 0; i_item < count; i_item++ )
/* Add the item */
/* FIXME: playlist_AddInput() can fail */
- playlist_AddInput( p_playlist, p_input, PLAYLIST_INSERT, i_position == -1 ? PLAYLIST_END : i_position + i_item, true,
+ playlist_AddInput( p_playlist, p_input, PLAYLIST_INSERT, i_position == -1 ? PLAYLIST_END : i_position + i_item, b_usingPlaylist,
pl_Locked );
+ if( i_item == 0 && !b_enqueue )
+ {
+ playlist_item_t *p_item = playlist_ItemGetByInput( p_playlist, p_input );
+ playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, pl_Locked, p_item->p_parent, p_item );
+ }
+
vlc_gc_decref( p_input );
}
PL_UNLOCK;
- if( i_position == -1 )
- i_position = [o_outline_dict count] - 1;
-
[self playlistUpdated];
- if( !b_enqueue )
- {
- [o_outline_view selectRowIndexes:[NSIndexSet indexSetWithIndex:i_position] byExtendingSelection:NO];
- [self playItem:nil];
- }
}
- (void)appendNodeArray:(NSArray*)o_array inNode:(playlist_item_t *)p_node atPos:(int)i_position enqueue:(BOOL)b_enqueue
/*First, only search after the selected item:*
*(b_selected_item_met = NO) */
- o_result = [self subSearchItem:p_playlist->p_root_category];
+ o_result = [self subSearchItem:[self currentPlaylistRoot]];
if( o_result == NULL )
{
/* If the first search failed, search again from the beginning */
- o_result = [self subSearchItem:p_playlist->p_root_category];
+ o_result = [self subSearchItem:[self currentPlaylistRoot]];
}
if( o_result != NULL )
{
}
if( i_row > -1 )
{
- [o_outline_view selectRowIndexes:[NSIndexSet indexSetWithIndex:i_row] byExtendingSelection:NO];
+ [o_outline_view selectRowIndexes:[NSIndexSet indexSetWithIndex:i_row] byExtendingSelection:NO];
[o_outline_view scrollRowToVisible: i_row];
}
}
{
int i_mode, i_type = 0;
intf_thread_t *p_intf = VLCIntf;
+ NSString * o_identifier = [o_tc identifier];
playlist_t *p_playlist = pl_Get( p_intf );
/* Check whether the selected table column header corresponds to a
sortable table column*/
- if( !( o_tc == o_tc_name || o_tc == o_tc_author ) )
- {
+ if( !( [o_identifier isEqualToString:TITLE_COLUMN] || [o_identifier isEqualToString:ARTIST_COLUMN] || [o_identifier isEqualToString:DURATION_COLUMN] ) )
return;
- }
if( o_tc_sortColumn == o_tc )
- {
b_isSortDescending = !b_isSortDescending;
- }
else
- {
b_isSortDescending = false;
- }
- if( o_tc == o_tc_name )
- {
+ if( [o_identifier isEqualToString:TITLE_COLUMN] )
i_mode = SORT_TITLE;
- }
- else if( o_tc == o_tc_author )
- {
+ else if( [o_identifier isEqualToString:ARTIST_COLUMN] )
i_mode = SORT_ARTIST;
- }
+ else if( [o_identifier isEqualToString:DURATION_COLUMN] )
+ i_mode = SORT_DURATION;
if( b_isSortDescending )
- {
i_type = ORDER_REVERSE;
- }
else
- {
i_type = ORDER_NORMAL;
- }
PL_LOCK;
- playlist_RecursiveNodeSort( p_playlist, p_playlist->p_root_category, i_mode, i_type );
+ playlist_RecursiveNodeSort( p_playlist, [self currentPlaylistRoot], i_mode, i_type );
PL_UNLOCK;
[self playlistUpdated];
[o_outline_view setHighlightedTableColumn:o_tc];
if( b_isSortDescending )
- {
- [o_outline_view setIndicatorImage:o_descendingSortingImage
- inTableColumn:o_tc];
- }
+ [o_outline_view setIndicatorImage:o_descendingSortingImage inTableColumn:o_tc];
else
- {
- [o_outline_view setIndicatorImage:o_ascendingSortingImage
- inTableColumn:o_tc];
- }
+ [o_outline_view setIndicatorImage:o_ascendingSortingImage inTableColumn:o_tc];
}
forTableColumn:(NSTableColumn *)tableColumn
item:(id)item
{
- playlist_t *p_playlist = pl_Get( VLCIntf );
+ /* this method can be called when VLC is already dead, hence the extra checks */
+ intf_thread_t * p_intf = VLCIntf;
+ if (!p_intf)
+ return;
+ playlist_t *p_playlist = pl_Get( p_intf );
+ if (!p_playlist)
+ return;
id o_playing_item;
return o_playing_item;
}
+
+- (NSArray *)draggedItems
+{
+ return [[o_nodes_array arrayByAddingObjectsFromArray: o_items_array] retain];
+}
@end
@implementation VLCPlaylist (NSOutlineViewDataSource)
{
id o_item = [items objectAtIndex: i];
- /* 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] &&
- var_CreateGetBool( p_playlist, "media-library" ) && ![self isItem: [o_item pointerValue] inNode: p_playlist->p_ml_category checkItemExistence: NO]) ||
- [o_item pointerValue] == p_playlist->p_local_category ||
- [o_item pointerValue] == p_playlist->p_ml_category )
- {
- return NO;
- }
/* Fill the items and nodes to move in 2 different arrays */
if( ((playlist_item_t *)[o_item pointerValue])->i_children > 0 )
[o_nodes_array addObject: o_item];
}
}
- /* Don't allow on drop on playlist root element's child */
- if( !item && index != NSOutlineViewDropOnItemIndex)
- {
- return NSDragOperationNone;
- }
-
/* 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. */
{
int i_row, i_removed_from_node = 0;
playlist_item_t *p_new_parent, *p_item = NULL;
- NSArray *o_all_items = [o_nodes_array arrayByAddingObjectsFromArray:
- o_items_array];
+ NSArray *o_all_items = [o_nodes_array arrayByAddingObjectsFromArray: o_items_array];
/* If the item is to be dropped as root item of the outline, make it a
- child of the General node.
+ child of the respective general node, if is either the pl or the ml
Else, choose the proposed parent as parent. */
- if( item == nil ) p_new_parent = p_playlist->p_local_category;
- else p_new_parent = [item pointerValue];
+ if( item == nil )
+ {
+ if ([self currentPlaylistRoot] == p_playlist->p_local_category || [self currentPlaylistRoot] == p_playlist->p_ml_category)
+ p_new_parent = [self currentPlaylistRoot];
+ else
+ return NO;
+ }
+ else
+ p_new_parent = [item pointerValue];
/* Make sure the proposed parent is a node.
(This should never be true) */
else if( [[o_pasteboard types] containsObject: NSFilenamesPboardType] )
{
+ if ([self currentPlaylistRoot] != p_playlist->p_local_category && [self currentPlaylistRoot] != p_playlist->p_ml_category)
+ return NO;
+
playlist_item_t *p_node = [item pointerValue];
NSArray *o_values = [[o_pasteboard propertyListForType: NSFilenamesPboardType]
sortedArrayUsingSelector: @selector(caseInsensitiveCompare:)];
NSUInteger count = [o_values count];
NSMutableArray *o_array = [NSMutableArray arrayWithCapacity:count];
+ input_thread_t * p_input = pl_CurrentInput( VLCIntf );
+ BOOL b_returned = NO;
+
+ if (count == 1 && p_input)
+ {
+ b_returned = input_AddSubtitle( p_input, make_URI([[o_values objectAtIndex:0] UTF8String], NULL), true );
+ vlc_object_release( p_input );
+ if(!b_returned)
+ return YES;
+ }
+ else if( p_input )
+ vlc_object_release( p_input );
for( NSUInteger i = 0; i < count; i++)
{
}
return NO;
}
-@end
-
+@end
projects / vlc / blobdiff