/*****************************************************************************
* playlist.m: MacOS X interface module
*****************************************************************************
-* Copyright (C) 2002-2008 the VideoLAN team
+* Copyright (C) 2002-2009 the VideoLAN team
* $Id$
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
#include <string.h>
#include <math.h>
#include <sys/mount.h>
-#include <vlc_keys.h>
#import "intf.h"
#import "wizard.h"
#import "playlistinfo.h"
#import "playlist.h"
#import "controls.h"
-#import "vlc_osd.h"
#import "misc.h"
-#import <vlc_interface.h>
+#import "sidebarview.h"
+
+#include <vlc_keys.h>
#import <vlc_services_discovery.h>
+#import <vlc_osd.h>
+#import <vlc_interface.h>
+
/*****************************************************************************
* VLCPlaylistView implementation
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]];
+ [o_outline_view_other setTarget: self];
+ [o_outline_view_other setDelegate: self];
+ [o_outline_view_other setDataSource: self];
+ [o_outline_view_other setAllowsEmptySelection: NO];
+
pl_Release( VLCIntf );
[self initStrings];
}
[[o_tc_name headerCell] setStringValue:_NS("Name")];
[[o_tc_author headerCell] setStringValue:_NS("Author")];
[[o_tc_duration headerCell] setStringValue:_NS("Duration")];
+
+ [[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)swapPlaylists:(id)newList
+{
+ 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;
+ }
}
- (NSOutlineView *)outlineView
int i_return = 0;
playlist_item_t *p_item = NULL;
playlist_t * p_playlist = pl_Hold( VLCIntf );
- assert( outlineView == o_outline_view );
+ //assert( outlineView == o_outline_view );
if( !item )
p_item = p_playlist->p_root_category;
if( o_value == nil )
{
- /* Why is there a warning if that happens all the time and seems
+ /* FIXME: Why is there a warning if that happens all the time and seems
* to be normal? Add an assert and fix it.
* msg_Warn( VLCIntf, "playlist item misses pointer value, adding one" ); */
o_value = [[NSValue valueWithPointer: p_return] retain];
int i_return = 0;
playlist_t *p_playlist = pl_Hold( VLCIntf );
+ PL_LOCK;
if( item == nil )
{
/* root object */
if( p_item )
i_return = p_item->i_children;
}
+ PL_UNLOCK;
pl_Release( VLCIntf );
return (i_return >= 0);
if( [[o_tc identifier] isEqualToString:@"name"] )
{
/* sanity check to prevent the NSString class from crashing */
- char *psz_title = input_item_GetTitle( p_item->p_input );
- if( !EMPTY_STR( psz_title ) )
+ char *psz_title = input_item_GetTitleFbName( p_item->p_input );
+ if( psz_title )
{
o_value = [NSString stringWithUTF8String: psz_title];
+ free( psz_title );
}
- else
- {
- char *psz_name = input_item_GetName( p_item->p_input );
- if( psz_name )
- o_value = [NSString stringWithUTF8String: psz_name];
- free( psz_name );
- }
- free( psz_title );
}
else if( [[o_tc identifier] isEqualToString:@"artist"] )
{
[super awakeFromNib];
[o_outline_view setDoubleAction: @selector(playItem:)];
+ [o_outline_view_other setDoubleAction: @selector(playItem:)];
[o_outline_view registerForDraggedTypes:
[NSArray arrayWithObjects: NSFilenamesPboardType,
@"VLCPlaylistItemPboardType", nil]];
[o_outline_view setIntercellSpacing: NSMakeSize (0.0, 1.0)];
+ [o_outline_view_other registerForDraggedTypes:
+ [NSArray arrayWithObjects: NSFilenamesPboardType,
+ @"VLCPlaylistItemPboardType", nil]];
+ [o_outline_view_other setIntercellSpacing: NSMakeSize (0.0, 1.0)];
+
/* This uses private Apple API which works fine until 10.5.
* We need to keep checking in the future!
* These methods are being added artificially to NSOutlineView's interface above */
o_tc_sortColumn = nil;
char ** ppsz_name;
- char ** ppsz_services = vlc_sd_GetNames( &ppsz_name );
+ char ** ppsz_services = vlc_sd_GetNames( VLCIntf, &ppsz_name );
if( !ppsz_services )
{
pl_Release( VLCIntf );
[o_mi_services setTitle: _NS("Services discovery")];
[o_mm_mi_services setTitle: _NS("Services discovery")];
[o_status_field setStringValue: _NS("No items in the playlist")];
+ [o_status_field_embed setStringValue: _NS("No items in the playlist")];
[o_search_field setToolTip: _NS("Search in Playlist")];
+ [o_search_field_other setToolTip: _NS("Search in Playlist")];
[o_mi_addNode setTitle: _NS("Add Folder to Playlist")];
[o_save_accessory_text setStringValue: _NS("File Format:")];
[[o_save_accessory_popup itemAtIndex:0] setTitle: _NS("Extended M3U")];
[[o_save_accessory_popup itemAtIndex:1] setTitle: _NS("XML Shareable Playlist Format (XSPF)")];
+ [[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
// 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];
+ [o_sidebar updateSidebar:[self playingItem]];
+ [[[[VLCMain sharedInstance] wizard] playlistWizard] reloadOutlineView];
+ [[[[VLCMain sharedInstance] bookmarks] dataTable] reloadData];
playlist_t *p_playlist = pl_Hold( VLCIntf );
[o_status_field setStringValue: [NSString stringWithFormat:
_NS("%i items"),
playlist_CurrentSize( p_playlist )]];
+ [o_status_field_embed setStringValue: [NSString stringWithFormat:
+ _NS("%i items"),
+ playlist_CurrentSize( p_playlist )]];
}
else
{
if( playlist_IsEmpty( p_playlist ) )
+ {
[o_status_field setStringValue: _NS("No items in the playlist")];
+ [o_status_field_embed setStringValue: _NS("No items in the playlist")];
+ }
else
+ {
[o_status_field setStringValue: _NS("1 item")];
+ [o_status_field_embed setStringValue: _NS("1 item")];
+ }
}
PL_UNLOCK;
pl_Release( VLCIntf );
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];
pl_Release( VLCIntf );
}
/* update the state of our Reveal-in-Finder menu items */
NSMutableString *o_mrl;
char *psz_uri = input_item_GetURI( p_item->p_input );
+
+ [o_mi_revealInFinder setEnabled: NO];
+ [o_mm_mi_revealInFinder setEnabled: NO];
if( psz_uri )
{
o_mrl = [NSMutableString stringWithUTF8String: psz_uri];
-
+
/* perform some checks whether it is a file and if it is local at all... */
NSRange prefix_range = [o_mrl rangeOfString: @"file:"];
if( prefix_range.location != NSNotFound )
[o_mrl deleteCharactersInRange: prefix_range];
-
+
if( [o_mrl characterAtIndex:0] == '/' )
{
[o_mi_revealInFinder setEnabled: YES];
[o_mm_mi_revealInFinder setEnabled: YES];
- return;
}
+ free( psz_uri );
}
- [o_mi_revealInFinder setEnabled: NO];
- [o_mm_mi_revealInFinder setEnabled: NO];
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];
}
}
}
[o_array insertObject: [NSValue valueWithPointer: p_temp_item] atIndex: 0];
p_temp_item = p_temp_item->p_parent;
}
+ PL_UNLOCK;
for( j = 0; j < [o_array count] - 1; j++ )
{
{
[o_outline_view expandItem: o_item];
}
-
}
- PL_UNLOCK;
pl_Release( VLCIntf );
}
NSSavePanel *o_save_panel = [NSSavePanel savePanel];
NSString * o_name = [NSString stringWithFormat: @"%@", _NS("Untitled")];
- //[o_save_panel setAllowedFileTypes: [NSArray arrayWithObjects: @"m3u", @"xpf", nil] ];
[o_save_panel setTitle: _NS("Save Playlist")];
[o_save_panel setPrompt: _NS("Save")];
[o_save_panel setAccessoryView: o_save_accessory_view];
{
NSString *o_filename = [o_save_panel filename];
- if( [o_save_accessory_popup indexOfSelectedItem] == 1 )
+ if( [o_save_accessory_popup indexOfSelectedItem] == 0 )
+ {
+ NSString * o_real_filename;
+ NSRange range;
+ range.location = [o_filename length] - [@".m3u" length];
+ range.length = [@".m3u" length];
+
+ if( [o_filename compare:@".m3u" options: NSCaseInsensitiveSearch
+ range: range] != NSOrderedSame )
+ {
+ o_real_filename = [NSString stringWithFormat: @"%@.m3u", o_filename];
+ }
+ else
+ {
+ o_real_filename = o_filename;
+ }
+ playlist_Export( p_playlist,
+ [o_real_filename fileSystemRepresentation],
+ p_playlist->p_local_category, "export-m3u" );
+ }
+ else if( [o_save_accessory_popup indexOfSelectedItem] == 1 )
{
NSString * o_real_filename;
NSRange range;
{
NSString * o_real_filename;
NSRange range;
- range.location = [o_filename length] - [@".m3u" length];
- range.length = [@".m3u" length];
+ range.location = [o_filename length] - [@".html" length];
+ range.length = [@".html" length];
- if( [o_filename compare:@".m3u" options: NSCaseInsensitiveSearch
+ if( [o_filename compare:@".html" options: NSCaseInsensitiveSearch
range: range] != NSOrderedSame )
{
- o_real_filename = [NSString stringWithFormat: @"%@.m3u", o_filename];
+ o_real_filename = [NSString stringWithFormat: @"%@.html", o_filename];
}
else
{
}
playlist_Export( p_playlist,
[o_real_filename fileSystemRepresentation],
- p_playlist->p_local_category, "export-m3u" );
+ p_playlist->p_local_category, "export-html" );
}
}
pl_Release( VLCIntf );
p_item = [[o_outline_view itemAtRow:[o_outline_view selectedRow]] pointerValue];
+ PL_LOCK;
if( p_item )
{
if( p_item->i_children == -1 )
{
p_node = p_item->p_parent;
+ }
+ else
+ {
+ p_node = p_item;
+ if( p_node->i_children > 0 && p_node->pp_children[0]->i_children == -1 )
+ {
+ p_item = p_node->pp_children[0];
+ }
+ else
+ {
+ p_item = NULL;
+ }
+ }
+ playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, pl_Locked, p_node, p_item );
+ }
+ PL_UNLOCK;
+ pl_Release( p_intf );
+}
+- (void)playSidebarItem:(id)item
+{
+ intf_thread_t * p_intf = VLCIntf;
+ playlist_t * p_playlist = pl_Hold( p_intf );
+
+ playlist_item_t *p_item;
+ playlist_item_t *p_node = NULL;
+
+ p_item = [item pointerValue];
+
+ if( p_item )
+ {
+ if( p_item->i_children == -1 )
+ {
+ p_node = p_item->p_parent;
+
}
else
{
p_playlist = pl_Hold( p_intf );
- PL_LOCK;
for( int i = 0; i < i_count; i++ )
{
o_number = [o_to_delete lastObject];
i_row = [o_number intValue];
id o_item = [o_outline_view itemAtRow: i_row];
+ [o_outline_view deselectRow: i_row];
+
+ PL_LOCK;
playlist_item_t *p_item = [o_item pointerValue];
#ifndef NDEBUG
msg_Dbg( p_intf, "deleting item %i (of %i) with id \"%i\", pointerValue \"%p\" and %i children", i+1, i_count,
p_item->p_input->i_id, [o_item pointerValue], p_item->i_children +1 );
#endif
[o_to_delete removeObject: o_number];
- [o_outline_view deselectRow: i_row];
if( p_item->i_children != -1 )
//is a node and not an item
playlist_NodeDelete( p_playlist, p_item, true, false );
}
else
- playlist_DeleteFromInput( p_playlist, p_item->p_input->i_id, pl_Locked );
+ playlist_DeleteFromInput( p_playlist, p_item->p_input, pl_Locked );
+
+ PL_UNLOCK;
+ [o_outline_dict removeObjectForKey:[NSString stringWithFormat:@"%p",
+ [o_item pointerValue]]];
+ [o_item release];
}
- PL_UNLOCK;
[self playlistUpdated];
pl_Release( p_intf );
p_item = p_playlist->p_root_category;
}
+ PL_LOCK;
if( p_item->i_children > -1 ) // the item is a node
{
- PL_LOCK;
playlist_RecursiveNodeSort( p_playlist, p_item, i_mode, ORDER_NORMAL );
- PL_UNLOCK;
}
else
{
- PL_LOCK;
playlist_RecursiveNodeSort( p_playlist,
p_item->p_parent, i_mode, ORDER_NORMAL );
- PL_UNLOCK;
}
+ PL_UNLOCK;
pl_Release( VLCIntf );
[self playlistUpdated];
}
}
}
}
- /* 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
o_uri = o_temp;
}
- p_input = input_item_New( p_playlist, [o_uri fileSystemRepresentation], [o_name UTF8String] );
+ p_input = input_item_New( p_playlist, [o_uri fileSystemRepresentation], o_name ? [o_name UTF8String] : NULL );
if( !p_input )
{
pl_Release( p_intf );
{
for( i = 0; i < (int)[o_options count]; i++ )
{
- input_item_AddOption( p_input, strdup( [[o_options objectAtIndex:i] UTF8String] ),
+ input_item_AddOption( p_input, [[o_options objectAtIndex:i] UTF8String],
VLC_INPUT_OPTION_TRUSTED );
}
}
}
if( i_row > -1 )
{
- [o_outline_view selectRow:i_row byExtendingSelection: NO];
+ [o_outline_view selectRowIndexes:[NSIndexSet indexSetWithIndex:i_row] byExtendingSelection:NO];
[o_outline_view scrollRowToVisible: i_row];
}
pl_Release( VLCIntf );
pl_Release( VLCIntf );
}
-- (IBAction)addNode:(id)sender
+- (id)playingItem
{
- /* 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];
+ playlist_t *p_playlist = pl_Hold( VLCIntf );
+
+ id o_playing_item;
+
+ PL_LOCK;
+ o_playing_item = [o_outline_dict objectForKey:
+ [NSString stringWithFormat:@"%p", playlist_CurrentPlayingItem( p_playlist )]];
+ PL_UNLOCK;
+
+ pl_Release( VLCIntf );
+
+ return o_playing_item;
}
-- (void)addNodeThreadedly
+- (IBAction)addNode:(id)sender
{
- 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 );
p_playlist->p_local_category, 0, NULL );
PL_UNLOCK;
- free( psz_name );
pl_Release( VLCIntf );
- [ourPool release];
-}
+ [self playlistUpdated];
+}
@end
@implementation VLCPlaylist (NSOutlineViewDataSource)
[o_status_field setStringValue: [NSString stringWithFormat:
_NS("%i items"),
playlist_CurrentSize( p_playlist )]];
+ [o_status_field_embed setStringValue: [NSString stringWithFormat:
+ _NS("%i items"),
+ playlist_CurrentSize( p_playlist )]];
}
else
{
if( playlist_IsEmpty( p_playlist ) )
{
[o_status_field setStringValue: _NS("No items in the playlist")];
+ [o_status_field_embed setStringValue: _NS("No items in the playlist")];
}
else
{
[o_status_field setStringValue: _NS("1 item")];
+ [o_status_field_embed setStringValue: _NS("1 item")];
}
}
PL_UNLOCK;
}
[o_outline_view deselectAll: self];
- [o_outline_view selectRow: i_row byExtendingSelection: NO];
+ [o_outline_view selectRowIndexes:[NSIndexSet indexSetWithIndex:i_row] byExtendingSelection:NO];
[o_outline_view scrollRowToVisible: i_row];
pl_Release( VLCIntf );
projects / vlc / blobdiff