Commit dfebdb6a authored by Jakob Leben's avatar Jakob Leben

playlist: only make The Playlist flat, not Media Library

parent 02745c6f
...@@ -82,8 +82,7 @@ static void input_item_add_subitem_tree ( const vlc_event_t * p_event, ...@@ -82,8 +82,7 @@ static void input_item_add_subitem_tree ( const vlc_event_t * p_event,
playlist_item_t *p_up = p_item; playlist_item_t *p_up = p_item;
while( p_up->p_parent ) while( p_up->p_parent )
{ {
if( p_up->p_parent == p_playlist->p_playing || if( p_up->p_parent == p_playlist->p_playing )
p_up->p_parent == p_playlist->p_media_library )
{ {
if( !pl_priv(p_playlist)->b_tree ) b_flat = true; if( !pl_priv(p_playlist)->b_tree ) b_flat = true;
break; break;
...@@ -104,7 +103,7 @@ static void input_item_add_subitem_tree ( const vlc_event_t * p_event, ...@@ -104,7 +103,7 @@ static void input_item_add_subitem_tree ( const vlc_event_t * p_event,
if( b_current ) if( b_current )
{ {
if( b_stop || !b_autostart ) if( ( b_stop && !b_flat ) || !b_autostart )
{ {
PL_UNLOCK; PL_UNLOCK;
playlist_Stop( p_playlist ); playlist_Stop( p_playlist );
......
...@@ -112,7 +112,7 @@ static void input_item_subitem_tree_added( const vlc_event_t * p_event, ...@@ -112,7 +112,7 @@ static void input_item_subitem_tree_added( const vlc_event_t * p_event,
PL_LOCK; PL_LOCK;
playlist_InsertInputItemTree ( p_playlist, p_playlist->p_media_library, playlist_InsertInputItemTree ( p_playlist, p_playlist->p_media_library,
p_root, 0, !pl_priv(p_playlist)->b_tree ); p_root, 0, false );
PL_UNLOCK; PL_UNLOCK;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment