X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fplaylist.m;h=c81aaff39b6a5474740924b8416e505b8469e0de;hb=2335fa6b566161fd6e5a3d171191fcf7165345a1;hp=a13cfa3b808d001671526151b0545c24f8b98504;hpb=d0d0541e004aae6cc99c76f4d9d01070f6de0799;p=vlc

diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m
index a13cfa3b80..c81aaff39b 100644
--- a/modules/gui/macosx/playlist.m
+++ b/modules/gui/macosx/playlist.m
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * 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>
@@ -25,7 +25,6 @@
 
 /* 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
@@ -82,8 +81,7 @@
 
         case NSEnterCharacter:
         case NSCarriageReturnCharacter:
-            [(VLCPlaylist *)[[VLCMain sharedInstance] getPlaylist]
-                                                            playItem:self];
+            [(VLCPlaylist *)[[VLCMain sharedInstance] getPlaylist] playItem:self];
             break;
 
         default:
@@ -94,7 +92,6 @@
 
 @end
 
-
 /*****************************************************************************
  * VLCPlaylistCommon implementation
  *
@@ -118,6 +115,7 @@
     [o_outline_view setTarget: self];
     [o_outline_view setDelegate: self];
     [o_outline_view setDataSource: self];
+    [o_outline_view setAllowsEmptySelection: NO];
 
     vlc_object_release( p_playlist );
     [self initStrings];
@@ -151,29 +149,19 @@
     int i_return = 0;
     playlist_item_t *p_item = NULL;
     playlist_t * p_playlist = pl_Yield( VLCIntf );
-    if( outlineView != o_outline_view )
-    {
-        vlc_object_release( p_playlist );
-        return 0;
-    }
+    assert( outlineView == o_outline_view );
 
-    if( item == nil )
-    {
-        /* root object */
+    if( !item )
         p_item = p_playlist->p_root_category;
-    }
     else
-    {
         p_item = (playlist_item_t *)[item pointerValue];
-    }
+
     if( p_item )
-            i_return = p_item->i_children;
-    vlc_object_release( p_playlist );
+        i_return = p_item->i_children;
 
-    if( i_return <= 0 )
-        i_return = 0;
+    pl_Release( VLCIntf );
 
-    return i_return;
+    return i_return > 0 ? i_return : 0;
 }
 
 /* return the child at index for the Obj-C pointer item */ /* DONE */
@@ -201,8 +189,8 @@
 
     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;
 }
@@ -279,7 +267,7 @@
         else
         {
             char *psz_name = input_item_GetName( p_item->p_input );
-            if( psz_name != NULL )
+            if( !EMPTY_STR( psz_name ) )
             {
                 o_value = [NSString stringWithUTF8String: psz_name];
             }
@@ -305,13 +293,12 @@
             }
             else
             {
-                o_value = @"-:--:--";
+                o_value = @"--:--";
             }
         }
         free( psz_artist );
     }
-
-    return( o_value );
+    return o_value;
 }
 
 @end
@@ -377,8 +364,8 @@
         @"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.5.
+     * 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];
@@ -387,16 +374,20 @@
 
     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++ )
     {
-        vlc_bool_t  b_enabled;
-        char        *objectname;
+        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, objectname );
+        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:
@@ -423,8 +414,6 @@
     free( ppsz_name );
 
     vlc_object_release( p_playlist );
-
-    //[self playlistUpdated];
 }
 
 - (void)searchfieldChanged:(NSNotification *)o_notification
@@ -441,17 +430,13 @@
     [o_mi_delete setTitle: _NS("Delete")];
     [o_mi_recursive_expand setTitle: _NS("Expand Node")];
     [o_mi_selectall setTitle: _NS("Select All")];
-    [o_mi_info setTitle: _NS("Information")];
-    [o_mi_preparse setTitle: _NS("Get Stream Information")];
+    [o_mi_info setTitle: _NS("Information...")];
+    [o_mi_preparse setTitle: _NS("Fetch Meta Data")];
     [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")];
 
@@ -462,10 +447,8 @@
 
 - (void)playlistUpdated
 {
-    unsigned int i;
-
     /* Clear indications of any existing column sorting */
-    for( i = 0 ; i < [[o_outline_view tableColumns] count] ; i++ )
+    for( unsigned int i = 0 ; i < [[o_outline_view tableColumns] count] ; i++ )
     {
         [o_outline_view setIndicatorImage:nil inTableColumn:
                             [[o_outline_view tableColumns] objectAtIndex:i]];
@@ -484,7 +467,7 @@
     if( playlist_CurrentSize( p_playlist ) >= 2 )
     {
         [o_status_field setStringValue: [NSString stringWithFormat:
-                    _NS("%i items in the playlist"),
+                    _NS("%i items"),
                 playlist_CurrentSize( p_playlist )]];
     }
     else
@@ -492,7 +475,7 @@
         if( playlist_IsEmpty( p_playlist ) )
             [o_status_field setStringValue: _NS("No items in the playlist")];
         else
-            [o_status_field setStringValue: _NS("1 item in the playlist")];
+            [o_status_field setStringValue: _NS("1 item")];
     }
     vlc_object_release( p_playlist );
 }
@@ -500,33 +483,44 @@
 - (void)playModeUpdated
 {
     playlist_t *p_playlist = pl_Yield( VLCIntf );
-    vlc_value_t val, val2;
 
-    var_Get( p_playlist, "loop", &val2 );
-    var_Get( p_playlist, "repeat", &val );
-    if( val.b_bool == VLC_TRUE )
-    {
+    bool loop = var_GetBool( p_playlist, "loop" );
+    bool repeat = var_GetBool( p_playlist, "repeat" );
+    if( repeat )
         [[[VLCMain sharedInstance] getControls] repeatOne];
-   }
-    else if( val2.b_bool == VLC_TRUE )
-    {
+    else if( loop )
         [[[VLCMain sharedInstance] getControls] repeatAll];
-    }
     else
-    {
         [[[VLCMain sharedInstance] getControls] repeatOff];
-    }
 
     [[[VLCMain sharedInstance] getControls] shuffle];
 
     vlc_object_release( p_playlist );
 }
 
+- (void)outlineViewSelectionDidChange:(NSNotification *)notification
+{
+    // FIXME: unsafe
+    playlist_item_t * p_item = [[o_outline_view itemAtRow:[o_outline_view selectedRow]] pointerValue];
+
+    if( p_item )
+    {
+        /* update our info-panel to reflect the new item */
+        [[[VLCMain sharedInstance] getInfo] updatePanelWithItem:p_item->p_input];
+    }
+}
+
+- (BOOL)isSelectionEmpty
+{
+    return [o_outline_view selectedRow] == -1;
+}
+
 - (void)updateRowSelection
 {
     int i_row;
     unsigned int j;
 
+    // FIXME: unsafe
     playlist_t *p_playlist = pl_Yield( VLCIntf );
     playlist_item_t *p_item, *p_temp_item;
     NSMutableArray *o_array = [NSMutableArray array];
@@ -543,14 +537,6 @@
     {
         [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++ )
@@ -565,16 +551,11 @@
 
     }
 
-    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];
+    /* update our info-panel to reflect the new item */
+    [[[VLCMain sharedInstance] getInfo] updatePanelWithItem:p_item->p_input];
 
     vlc_object_release( p_playlist );
 
-    /* update our info-panel to reflect the new item */
-    [[[VLCMain sharedInstance] getInfo] updatePanel];
 }
 
 /* Check if p_item is a child of p_node recursively. We need to check the item
@@ -604,7 +585,7 @@
     if ( p_temp_item )
     {
         int i;
-        vlc_mutex_lock( &p_playlist->object_lock );
+        PL_LOCK;
 
         if( b_check )
         {
@@ -617,7 +598,7 @@
                 else if ( i == p_playlist->all_items.i_size - 1 )
                 {
                     vlc_object_release( p_playlist );
-                    vlc_mutex_unlock( &p_playlist->object_lock );
+                    PL_UNLOCK;
                     return NO;
                 }
             }
@@ -628,12 +609,12 @@
             p_temp_item = p_temp_item->p_parent;
             if( p_temp_item == p_node )
             {
-                 vlc_mutex_unlock( &p_playlist->object_lock );
-                 vlc_object_release( p_playlist );
-                 return YES;
+                PL_UNLOCK;
+                vlc_object_release( p_playlist );
+                return YES;
             }
         }
-        vlc_mutex_unlock( &p_playlist->object_lock );
+        PL_UNLOCK;
     }
 
     vlc_object_release( p_playlist );
@@ -670,8 +651,7 @@
 
 - (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")];
@@ -760,7 +740,7 @@
                 p_item = NULL;
             }
         }
-        playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, VLC_TRUE, p_node, p_item );
+        playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, false, p_node, p_item );
     }
     vlc_object_release( p_playlist );
 }
@@ -796,7 +776,7 @@
             }
             else
             {
-                msg_Dbg( p_intf, "preparse of nodes not yet implemented" );
+                msg_Dbg( p_intf, "preparsing nodes not implemented" );
             }
         }
     }
@@ -829,48 +809,49 @@
 
 - (IBAction)deleteItem:(id)sender
 {
-    int i, i_count, i_row;
+    int i_count, i_row;
     NSMutableArray *o_to_delete;
     NSNumber *o_number;
 
     playlist_t * p_playlist;
     intf_thread_t * p_intf = VLCIntf;
 
-    p_playlist = pl_Yield( p_intf );
-
     o_to_delete = [NSMutableArray arrayWithArray:[[o_outline_view selectedRowEnumerator] allObjects]];
     i_count = [o_to_delete count];
 
-    for( i = 0; i < i_count; i++ )
+    p_playlist = pl_Yield( 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];
         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( [[o_outline_view dataSource] outlineView:o_outline_view
-                                        numberOfChildrenOfItem: o_item]  > 0 )
+        if( p_item->i_children != -1 )
         //is a node and not an item
         {
             if( p_playlist->status.i_status != PLAYLIST_STOPPED &&
                 [self isItem: p_playlist->status.p_item inNode:
                         ((playlist_item_t *)[o_item pointerValue])
                         checkItemExistence: NO] == YES )
-            {
                 // if current item is in selected node and is playing then stop playlist
                 playlist_Stop( p_playlist );
-            }
-            vlc_mutex_lock( &p_playlist->object_lock );
-            playlist_NodeDelete( p_playlist, p_item, VLC_TRUE, VLC_FALSE );
-            vlc_mutex_unlock( &p_playlist->object_lock );
+    
+            playlist_NodeDelete( p_playlist, p_item, true, false );
         }
         else
-        {
-            playlist_DeleteFromInput( p_playlist, p_item->p_input->i_id, VLC_FALSE );
-        }
+            playlist_DeleteFromInput( p_playlist, p_item->p_input->i_id, true );
     }
+    PL_UNLOCK;
+
     [self playlistUpdated];
     vlc_object_release( p_playlist );
 }
@@ -892,8 +873,7 @@
 
     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*/
@@ -903,16 +883,16 @@
 
     if( p_item->i_children > -1 ) // the item is a node
     {
-        vlc_mutex_lock( &p_playlist->object_lock );
+        PL_LOCK;
         playlist_RecursiveNodeSort( p_playlist, p_item, i_mode, ORDER_NORMAL );
-        vlc_mutex_unlock( &p_playlist->object_lock );
+        PL_UNLOCK;
     }
     else
     {
-        vlc_mutex_lock( &p_playlist->object_lock );
+        PL_LOCK;
         playlist_RecursiveNodeSort( p_playlist,
                 p_item->p_parent, i_mode, ORDER_NORMAL );
-        vlc_mutex_unlock( &p_playlist->object_lock );
+        PL_UNLOCK;
     }
     vlc_object_release( p_playlist );
     [self playlistUpdated];
@@ -935,7 +915,7 @@
     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?) */
+    /* 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 )
     {
         int i_count, i_index;
@@ -948,9 +928,9 @@
             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: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_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 )
             {
@@ -975,9 +955,9 @@
         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: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 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;
     }
 
@@ -995,7 +975,7 @@
 
     /* 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];
@@ -1010,6 +990,7 @@
     int i_item;
     playlist_t * p_playlist = pl_Yield( VLCIntf );
 
+    PL_LOCK;
     for( i_item = 0; i_item < (int)[o_array count]; i_item++ )
     {
         input_item_t *p_input;
@@ -1024,23 +1005,22 @@
         }
 
         /* 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, VLC_TRUE,
-         VLC_FALSE );
+             i_position == -1 ? PLAYLIST_END : i_position + i_item, true,
+         true );
 
         if( i_item == 0 && !b_enqueue )
         {
             playlist_item_t *p_item;
-            p_item = playlist_ItemGetByInput( p_playlist, p_input, VLC_TRUE );
-            playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, VLC_TRUE, NULL, p_item );
-        }
-        else
-        {
-            playlist_item_t *p_item;
-            p_item = playlist_ItemGetByInput( p_playlist, p_input, VLC_TRUE );
-            playlist_Control( p_playlist, PLAYLIST_SKIP, VLC_TRUE, p_item );
+            p_item = playlist_ItemGetByInput( p_playlist, p_input, true );
+            playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, true, NULL, p_item );
         }
+        vlc_gc_decref( p_input );
     }
+    PL_UNLOCK;
+
     [self playlistUpdated];
     vlc_object_release( p_playlist );
 }
@@ -1064,24 +1044,20 @@
         }
 
         /* Add the item */
+        /* FIXME: playlist_NodeAddInput() can fail */
        playlist_NodeAddInput( p_playlist, p_input, p_node,
                                       PLAYLIST_INSERT,
                                       i_position == -1 ?
-                                      PLAYLIST_END : i_position + i_item, VLC_FALSE );
+                                      PLAYLIST_END : i_position + i_item, false );
 
 
         if( i_item == 0 && !b_enqueue )
         {
             playlist_item_t *p_item;
-            p_item = playlist_ItemGetByInput( p_playlist, p_input, VLC_TRUE );
-            playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, VLC_TRUE, NULL, p_item );
-        }
-        else
-        {
-            playlist_item_t *p_item;
-            p_item = playlist_ItemGetByInput( p_playlist, p_input, VLC_TRUE );
-            playlist_Control( p_playlist, PLAYLIST_SKIP, VLC_TRUE, p_item );
+            p_item = playlist_ItemGetByInput( p_playlist, p_input, true );
+            playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, true, NULL, p_item );
         }
+        vlc_gc_decref( p_input );
     }
     [self playlistUpdated];
     vlc_object_release( p_playlist );
@@ -1105,14 +1081,14 @@
         char *psz_temp;
         NSString *o_current_name, *o_current_author;
 
-        vlc_mutex_lock( &p_playlist->object_lock );
+        PL_LOCK;
         o_current_name = [NSString stringWithUTF8String:
             p_item->pp_children[i_current]->p_input->psz_name];
         psz_temp = input_ItemGetInfo( p_item->p_input ,
                    _("Meta-information"),_("Artist") );
         o_current_author = [NSString stringWithUTF8String: psz_temp];
         free( psz_temp);
-        vlc_mutex_unlock( &p_playlist->object_lock );
+        PL_UNLOCK;
 
         if( p_selected_item == p_item->pp_children[i_current] &&
                     b_selected_item_met == NO )
@@ -1127,9 +1103,9 @@
         }
         else if( b_selected_item_met == YES &&
                     ( [o_current_name rangeOfString:[o_search_field
-                        stringValue] options:NSCaseInsensitiveSearch ].length ||
+                        stringValue] options:NSCaseInsensitiveSearch].length ||
                       [o_current_author rangeOfString:[o_search_field
-                        stringValue] options:NSCaseInsensitiveSearch ].length ) )
+                        stringValue] options:NSCaseInsensitiveSearch].length ) )
         {
             vlc_object_release( p_playlist );
             /*Adds the parent items in the result array as well, so that we can
@@ -1221,13 +1197,16 @@
 - (NSMenu *)menuForEvent:(NSEvent *)o_event
 {
     NSPoint pt;
-    vlc_bool_t b_rows;
-    vlc_bool_t b_item_sel;
+    bool b_rows;
+    bool b_item_sel;
 
     pt = [o_outline_view convertPoint: [o_event locationInWindow]
                                                  fromView: nil];
-    b_item_sel = ( [o_outline_view rowAtPoint: pt] != -1 &&
-                   [o_outline_view selectedRow] != -1 );
+    NSInteger row = [o_outline_view rowAtPoint:pt];
+    if( row != -1 )
+        [o_outline_view selectRowIndexes:[NSIndexSet indexSetWithIndex:row] byExtendingSelection:NO];
+
+    b_item_sel = ( row != -1 && [o_outline_view selectedRow] != -1 );
     b_rows = [o_outline_view numberOfRows] != 0;
 
     [o_mi_play setEnabled: b_item_sel];
@@ -1264,7 +1243,7 @@
     }
     else
     {
-        b_isSortDescending = VLC_FALSE;
+        b_isSortDescending = false;
     }
 
     if( o_tc == o_tc_name )
@@ -1285,9 +1264,9 @@
         i_type = ORDER_NORMAL;
     }
 
-    vlc_mutex_lock( &p_playlist->object_lock );
+    vlc_object_lock( p_playlist );
     playlist_RecursiveNodeSort( p_playlist, p_playlist->p_root_category, i_mode, i_type );
-    vlc_mutex_unlock( &p_playlist->object_lock );
+    vlc_object_unlock( p_playlist );
 
     vlc_object_release( p_playlist );
     [self playlistUpdated];
@@ -1324,11 +1303,11 @@
                         [item pointerValue] checkItemExistence: YES]
                         || [o_playing_item isEqual: item] )
     {
-        [cell setFont: [NSFont boldSystemFontOfSize: 0]];
+        [cell setFont: [[NSFontManager sharedFontManager] convertFont:[cell font] toHaveTrait:NSBoldFontMask]];
     }
     else
     {
-        [cell setFont: [NSFont systemFontOfSize: 0]];
+        [cell setFont: [[NSFontManager sharedFontManager] convertFont:[cell font] toNotHaveTrait:NSBoldFontMask]];
     }
     vlc_object_release( p_playlist );
 }
@@ -1357,7 +1336,7 @@
     ret_v = intf_UserStringInput( p_playlist, _("New Node"),
         _("Please enter a name for the new node."), &psz_name );
 
-    if( psz_name != NULL && psz_name != "" )
+    if( ret_v != DIALOG_CANCELLED && psz_name && *psz_name )
         p_item = playlist_NodeCreate( p_playlist, psz_name,
                                       p_playlist->p_local_category, 0, NULL );
     else if(! config_GetInt( p_playlist, "interact" ) )
@@ -1386,7 +1365,7 @@
     if( playlist_CurrentSize( p_playlist )  >= 2 )
     {
         [o_status_field setStringValue: [NSString stringWithFormat:
-                    _NS("%i items in the playlist"),
+                    _NS("%i items"),
              playlist_CurrentSize( p_playlist )]];
     }
     else
@@ -1397,14 +1376,13 @@
         }
         else
         {
-            [o_status_field setStringValue: _NS("1 item in the playlist")];
+            [o_status_field setStringValue: _NS("1 item")];
         }
     }
     vlc_object_release( p_playlist );
 
     [o_outline_dict setObject:o_value forKey:[NSString stringWithFormat:@"%p",
                                                     [o_value pointerValue]]];
-    msg_Dbg( VLCIntf, "adding item %p", [o_value pointerValue] );
     return o_value;
 
 }
@@ -1427,7 +1405,10 @@
         /* 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;
@@ -1483,8 +1464,8 @@
     /* 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;
@@ -1569,8 +1550,8 @@
                 }
             }
 
-            vlc_mutex_lock( &p_playlist->object_lock );
-            // Acually detach the item from the old position
+            PL_LOCK;
+            // Actually detach the item from the old position
             if( playlist_NodeRemoveItem( p_playlist, p_item, p_old_parent ) ==
                 VLC_SUCCESS )
             {
@@ -1592,7 +1573,7 @@
                 // Reattach the item to the new position
                 playlist_NodeInsert( p_playlist, p_item, p_new_parent, i_new_index );
             }
-            vlc_mutex_unlock( &p_playlist->object_lock );
+            PL_UNLOCK;
         }
         [self playlistUpdated];
         i_row = [o_outline_view rowForItem:[o_outline_dict
@@ -1636,14 +1617,9 @@
         {
             [self appendArray: o_array atPos: index enqueue: YES];
         }
-        /* This should never occur */
-        else if( p_node->i_children == -1 )
-        {
-            vlc_object_release( p_playlist );
-            return NO;
-        }
         else
         {
+            assert( p_node->i_children != -1 );
             [self appendNodeArray: o_array inNode: p_node
                 atPos: index enqueue: YES];
         }