/*****************************************************************************
- * playlist.m: MacOS X interface plugin
+ * playlist.m: MacOS X interface module
*****************************************************************************
- * Copyright (C) 2002-2003 VideoLAN
- * $Id: playlist.m,v 1.44 2003/11/19 14:58:54 bigben Exp $
+ * Copyright (C) 2002-2004 VideoLAN
+ * $Id: playlist.m,v 1.55 2004/01/25 17:01:57 murray Exp $
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
- * Derk-Jan Hartman <thedj@users.sourceforge.net>
+ * Derk-Jan Hartman <hartman 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
}
}
+
@end
/*****************************************************************************
[o_window setExcludedFromWindowsMenu: TRUE];
+/* 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)])
+ {
+ o_ascendingSortingImage = [[NSTableView class] _defaultTableHeaderSortImage];
+ }
+ else
+ {
+ o_ascendingSortingImage = nil;
+ }
+
+ if ([[NSTableView class] respondsToSelector:@selector(_defaultTableHeaderReverseSortImage)])
+ {
+ o_descendingSortingImage = [[NSTableView class] _defaultTableHeaderReverseSortImage];
+ }
+ else
+ {
+ o_descendingSortingImage = nil;
+ }
+
+ [self initStrings];
+}
+
+- (void)initStrings
+{
[o_window setTitle: _NS("Playlist")];
[o_mi_save_playlist setTitle: _NS("Save Playlist...")];
[o_mi_play setTitle: _NS("Play")];
[o_mi_selectall setTitle: _NS("Select All")];
[[o_tc_name headerCell] setStringValue:_NS("Name")];
[[o_tc_author headerCell] setStringValue:_NS("Author")];
+ [[o_tc_duration headerCell] setStringValue:_NS("Duration")];
[o_random_ckb setTitle: _NS("Random")];
[o_loop_ckb setTitle: _NS("Repeat All")];
[o_repeat_ckb setTitle: _NS("Repeat One")];
[o_search_button setTitle: _NS("Search")];
+ [o_btn_playlist setToolTip: _NS("Playlist")];
+}
-
- vlc_value_t val;
+- (void) tableView:(NSTableView*)o_tv
+ didClickTableColumn:(NSTableColumn *)o_tc
+{
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 )
- {
- var_Get( p_playlist, "random", &val );
- [o_random_ckb setState: val.b_bool];
+ playlist_t *p_playlist =
+ (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
- var_Get( p_playlist, "loop", &val );
- [o_loop_ckb setState: val.b_bool];
+ int max = [[o_table_view tableColumns] count];
+ int i;
- var_Get( p_playlist, "repeat", &val );
- [o_repeat_ckb setState: val.b_bool];
+ if( p_playlist == NULL )
+ {
+ return;
+ }
- vlc_object_release( p_playlist );
+ if (o_tc_sortColumn == o_tc )
+ {
+ b_isSortDescending = !b_isSortDescending;
+ }
+ else if (o_tc == o_tc_name || o_tc == o_tc_author)
+ {
+ 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_name == o_tc && !b_isSortDescending)
+ {
+ playlist_SortTitle( p_playlist , 0 );
+ [o_table_view setIndicatorImage:o_ascendingSortingImage inTableColumn:o_tc];
+ }
+ else if (o_tc_author == o_tc && !b_isSortDescending)
+ {
+ playlist_SortAuthor( p_playlist , 0 );
+ [o_table_view setIndicatorImage:o_ascendingSortingImage inTableColumn:o_tc];
+ }
+ else if (o_tc_name == o_tc && b_isSortDescending)
+ {
+ playlist_SortTitle( p_playlist , 1 );
+ [o_table_view setIndicatorImage:o_descendingSortingImage inTableColumn:o_tc];
}
+ else if (o_tc_author == o_tc && b_isSortDescending)
+ {
+ playlist_SortAuthor( p_playlist , 1 );
+ [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
if( [o_window isVisible] )
{
[o_window orderOut:sender];
+ [o_btn_playlist setState:NSOffState];
}
else
{
[o_window makeKeyAndOrderFront:sender];
+ [o_btn_playlist setState:NSOnState];
}
}
if( [o_save_panel runModalForDirectory: nil
file: o_name] == NSOKButton )
{
- playlist_SaveFile( p_playlist, [[o_save_panel filename] fileSystemRepresentation] );
+ playlist_Export( p_playlist, [[o_save_panel filename] fileSystemRepresentation], "m3u" );
}
}
- (IBAction)searchItem:(id)sender
{
- int i_current = 0, i_counter;
+ int i_current = -1;
NSString *o_current_name;
NSString *o_current_author;
{
return;
}
+ if( [o_table_view numberOfRows] < 1 )
+ {
+ return;
+ }
- if ([o_table_view selectedRow] == [o_table_view numberOfRows]-1 )
+ if( [o_table_view selectedRow] == [o_table_view numberOfRows]-1 )
{
- i_current = 0;
+ i_current = -1;
}
else
{
- i_current = [o_table_view selectedRow]+1;
+ i_current = [o_table_view selectedRow];
}
- while (i_current != [o_table_view selectedRow])
+ do
{
+ i_current++;
+
vlc_mutex_lock( &p_playlist->object_lock );
o_current_name = [NSString stringWithUTF8String:
p_playlist->pp_items[i_current]->psz_name];
o_current_author = [NSString stringWithUTF8String:
- p_playlist->pp_items[i_current]->psz_author];
+ playlist_GetInfo(p_playlist, i_current ,_("General"),_("Author") )];
vlc_mutex_unlock( &p_playlist->object_lock );
[o_table_view scrollRowToVisible: i_current];
break;
}
- if ( i_current == [o_table_view numberOfRows] - 1 )
- {
- i_current = 0;
- }
- else
+ if( i_current == [o_table_view numberOfRows] - 1 )
{
- i_current++;
+ i_current = -1;
}
}
+ while (i_current != [o_table_view selectedRow]);
vlc_object_release( p_playlist );
}
+
- (void)appendArray:(NSArray*)o_array atPos:(int)i_position enqueue:(BOOL)b_enqueue
{
int i_item;
{
/* One item */
NSDictionary *o_one_item;
- int j;
- int i_total_options = 0;
+ int j, i_new_id = -1;
int i_mode = PLAYLIST_INSERT;
BOOL b_rem = FALSE, b_dir = FALSE;
- NSString *o_url, *o_name;
+ NSString *o_uri, *o_name;
NSArray *o_options;
- char **ppsz_options = NULL;
+ NSURL *o_true_file;
/* Get the item */
o_one_item = [o_array objectAtIndex: i_item];
- o_url = (NSString *)[o_one_item objectForKey: @"ITEM_URL"];
+ 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_url];
+ if( !o_name) o_name = [[NSFileManager defaultManager] displayNameAtPath: o_uri];
- if( [[NSFileManager defaultManager] fileExistsAtPath:o_url isDirectory:&b_dir] && b_dir &&
- [[NSWorkspace sharedWorkspace] getFileSystemInfoForPath: o_url isRemovable: &b_rem
+ 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 */
struct statfs *buf;
char *psz_dev, *temp;
buf = (struct statfs *) malloc (sizeof(struct statfs));
- statfs( [o_url fileSystemRepresentation], buf );
+ statfs( [o_uri fileSystemRepresentation], buf );
psz_dev = strdup(buf->f_mntfromname);
free( buf );
temp = strrchr( psz_dev , 's' );
psz_dev[temp - psz_dev] = '\0';
- o_url = [NSString stringWithCString: psz_dev ];
+ o_uri = [NSString stringWithCString: psz_dev ];
}
-
- if (i_item == 0 && !b_enqueue)
- i_mode |= PLAYLIST_GO;
-
- if( o_options && [o_options count] > 0 )
+
+ /* Add the item */
+ i_new_id = playlist_Add( p_playlist, [o_uri fileSystemRepresentation],
+ [o_name UTF8String], i_mode,
+ i_position == -1 ? PLAYLIST_END : i_position + i_item);
+
+ /* Add the options, when there are any */
+ if( o_options )
{
- /* Count the input options */
- i_total_options = [o_options count];
-
- /* Allocate ppsz_options */
- for( j = 0; j < i_total_options; j++ )
+ for( j = 0; j < [o_options count]; j++ )
{
- if( !ppsz_options )
- ppsz_options = (char **)malloc( sizeof(char *) * i_total_options );
-
- ppsz_options[j] = strdup([[o_options objectAtIndex:j] UTF8String]);
+ playlist_AddOption( p_playlist, i_new_id,
+ strdup( [[o_options objectAtIndex:j] UTF8String] ) );
}
}
-
- playlist_AddExt( p_playlist, [o_url fileSystemRepresentation], [o_name UTF8String], -1,
- (ppsz_options != NULL ) ? (const char **)ppsz_options : 0, i_total_options,
- i_mode, i_position == -1 ? PLAYLIST_END : i_position + i_item);
-
- /* clean up */
- for( j = 0; j < i_total_options; j++ )
- free( ppsz_options[j] );
- if( ppsz_options ) free( ppsz_options );
+
+ if( i_item == 0 && !b_enqueue )
+ {
+ playlist_Goto( p_playlist, playlist_GetPositionById( p_playlist, i_new_id ) );
+ playlist_Play( p_playlist );
+ }
/* Recent documents menu */
- NSURL *o_true_url = [NSURL fileURLWithPath: o_url];
- if( o_true_url != nil )
+ o_true_file = [NSURL fileURLWithPath: o_uri];
+ if( o_true_file != nil )
{
[[NSDocumentController sharedDocumentController]
- noteNewRecentDocumentURL: o_true_url];
+ noteNewRecentDocumentURL: o_true_file];
}
}
- (void)playlistUpdated
{
+ vlc_value_t val;
+ 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 )
+ {
+ var_Get( p_playlist, "random", &val );
+ [o_random_ckb setState: val.b_bool];
+
+ var_Get( p_playlist, "loop", &val );
+ [o_loop_ckb setState: val.b_bool];
+
+ var_Get( p_playlist, "repeat", &val );
+ [o_repeat_ckb setState: val.b_bool];
+
+ vlc_object_release( p_playlist );
+ }
[o_table_view reloadData];
}
[o_table_view selectRow: i_row byExtendingSelection: NO];
[o_table_view scrollRowToVisible: i_row];
}
-
+
@end
else if( [[o_tc identifier] isEqualToString:@"1"] )
{
vlc_mutex_lock( &p_playlist->object_lock );
- o_value = [[NSString stringWithUTF8String:
- p_playlist->pp_items[i_row]->psz_name] lastPathComponent];
+ o_value = [NSString stringWithUTF8String:
+ p_playlist->pp_items[i_row]->psz_name];
vlc_mutex_unlock( &p_playlist->object_lock );
}
else if( [[o_tc identifier] isEqualToString:@"2"] )
{
vlc_mutex_lock( &p_playlist->object_lock );
o_value = [NSString stringWithUTF8String:
- p_playlist->pp_items[i_row]->psz_author];
+ playlist_GetInfo(p_playlist, i_row ,_("General"),_("Author") )];
vlc_mutex_unlock( &p_playlist->object_lock );
}
+ else if( [[o_tc identifier] isEqualToString:@"3"] )
+ {
+ char psz_duration[MSTRTIME_MAX_SIZE];
+ mtime_t dur = p_playlist->pp_items[i_row]->i_duration;
+ if( dur != -1 )
+ {
+ secstotimestr( psz_duration, dur/1000000 );
+ o_value = [NSString stringWithUTF8String: psz_duration];
+ }
+ else
+ {
+ o_value = @"-:--:--";
+ }
+ }
vlc_object_release( p_playlist );
[self updateRowSelection];
}
+/* Delegate method of NSWindow */
+- (void)windowWillClose:(NSNotification *)aNotification
+{
+ [o_btn_playlist setState: NSOffState];
+}
+
@end
projects / vlc / blobdiff