[vlc-devel] commit: playlist: only make The Playlist flat, not Media Library ( Jakob Leben )

[git version control]

vlc | branch: master | Jakob Leben <jleben at videolan.org> | Tue Feb 23 11:41:35 2010 +0100| [dfebdb6a7f9ef786468684952d20a9b34950135b] | committer: Jakob Leben 

playlist: only make The Playlist flat, not Media Library

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

 src/playlist/item.c     |    5 ++---
 src/playlist/loadsave.c |    2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/playlist/item.c b/src/playlist/item.c
index 3b639de..686f0f4 100644
--- a/src/playlist/item.c
+++ b/src/playlist/item.c
@@ -82,8 +82,7 @@ static void input_item_add_subitem_tree ( const vlc_event_t * p_event,
     playlist_item_t *p_up = p_item;
     while( p_up->p_parent )
     {
-        if( p_up->p_parent == p_playlist->p_playing ||
-            p_up->p_parent == p_playlist->p_media_library )
+        if( p_up->p_parent == p_playlist->p_playing )
         {
             if( !pl_priv(p_playlist)->b_tree ) b_flat = true;
             break;
@@ -104,7 +103,7 @@ static void input_item_add_subitem_tree ( const vlc_event_t * p_event,
 
     if( b_current )
     {
-        if( b_stop || !b_autostart )
+        if( ( b_stop && !b_flat ) || !b_autostart )
         {
             PL_UNLOCK;
             playlist_Stop( p_playlist );
diff --git a/src/playlist/loadsave.c b/src/playlist/loadsave.c
index 9681058..4a6b0bc 100644
--- a/src/playlist/loadsave.c
+++ b/src/playlist/loadsave.c
@@ -112,7 +112,7 @@ static void input_item_subitem_tree_added( const vlc_event_t * p_event,
 
     PL_LOCK;
     playlist_InsertInputItemTree ( p_playlist, p_playlist->p_media_library,
-                                   p_root, 0, !pl_priv(p_playlist)->b_tree );
+                                   p_root, 0, false );
     PL_UNLOCK;
 }