Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
dfebdb6a
Commit
dfebdb6a
authored
Feb 23, 2010
by
Jakob Leben
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
playlist: only make The Playlist flat, not Media Library
parent
02745c6f
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
src/playlist/item.c
src/playlist/item.c
+2
-3
src/playlist/loadsave.c
src/playlist/loadsave.c
+1
-1
No files found.
src/playlist/item.c
View file @
dfebdb6a
...
@@ -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
);
...
...
src/playlist/loadsave.c
View file @
dfebdb6a
...
@@ -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_tre
e
);
p_root
,
0
,
fals
e
);
PL_UNLOCK
;
PL_UNLOCK
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment