[vlc-commits] macosx: respect b_enqueue value when adding items to the playlist

[David Fuhrmann]

vlc/vlc-1.2 | branch: master | David Fuhrmann <david.fuhrmann at googlemail.com> | Sun Jan  8 21:05:24 2012 +0100| [11b3731eda74fb539230390ecfba85e4711f901c] | committer: Jean-Baptiste Kempf

macosx: respect b_enqueue value when adding items to the playlist

also adds forgotten PL_LOCK and removes a commented out code block which should not be needed anymore

Signed-off-by: Felix Paul Kühne <fkuehne at videolan.org>
(cherry picked from commit 3ed6c0090febe190909fb867ae4dfac5311e9c06)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=11b3731eda74fb539230390ecfba85e4711f901c
---

 modules/gui/macosx/playlist.m |   29 +++++++----------------------
 1 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m
index 5107431..f09f19b 100644
--- a/modules/gui/macosx/playlist.m
+++ b/modules/gui/macosx/playlist.m
@@ -184,6 +184,7 @@
     playlist_t * p_playlist = pl_Get( VLCIntf );
     //assert( outlineView == o_outline_view );
 
+    PL_LOCK;
     if( !item )
         p_item = p_playlist->p_root_category;
     else
@@ -191,6 +192,7 @@
 
     if( p_item )
         i_return = p_item->i_children;
+    PL_UNLOCK;
 
     return i_return > 0 ? i_return : 0;
 }
@@ -1093,26 +1095,6 @@
         playlist_AddInput( p_playlist, p_input, PLAYLIST_INSERT, i_position == -1 ? PLAYLIST_END : i_position + i_item, true,
          pl_Locked );
 
-/*        if( i_item == 0 && !b_enqueue )
-        {
-            playlist_item_t *p_item = NULL;
-            playlist_item_t *p_node = NULL;
-            p_item = playlist_ItemGetByInput( p_playlist, p_input );
-            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 );
-            }
-        }*/
         vlc_gc_decref( p_input );
     }
     PL_UNLOCK;
@@ -1120,8 +1102,11 @@
         i_position = [o_outline_dict count] - 1;
 
     [self playlistUpdated];
-    [o_outline_view selectRowIndexes:[NSIndexSet indexSetWithIndex:i_position] byExtendingSelection:NO];
-    [self playItem:nil];
+    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