Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
VLC
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
15
Merge Requests
15
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
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
Steve Lhomme
VLC
Commits
4630d8e2
Commit
4630d8e2
authored
Nov 16, 2016
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
playlist: inline playlist_NodeEmpty()
parent
9afd42ce
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
23 deletions
+6
-23
src/playlist/item.c
src/playlist/item.c
+6
-1
src/playlist/playlist_internal.h
src/playlist/playlist_internal.h
+0
-2
src/playlist/tree.c
src/playlist/tree.c
+0
-20
No files found.
src/playlist/item.c
View file @
4630d8e2
...
...
@@ -352,8 +352,13 @@ int playlist_DeleteFromInput( playlist_t *p_playlist, input_item_t *p_input,
*/
void
playlist_Clear
(
playlist_t
*
p_playlist
,
bool
b_locked
)
{
playlist_item_t
*
p_root
=
p_playlist
->
p_playing
;
PL_LOCK_IF
(
!
b_locked
);
playlist_NodeEmpty
(
p_playlist
,
p_playlist
->
p_playing
);
for
(
int
i
=
p_root
->
i_children
-
1
;
i
>=
0
;
i
--
)
playlist_NodeDelete
(
p_playlist
,
p_root
->
pp_children
[
i
],
false
);
PL_UNLOCK_IF
(
!
b_locked
);
}
...
...
src/playlist/playlist_internal.h
View file @
4630d8e2
...
...
@@ -134,8 +134,6 @@ playlist_item_t *playlist_ItemFindFromInputAndRoot( playlist_t *p_playlist,
void
playlist_ItemRelease
(
playlist_item_t
*
);
void
playlist_NodeEmpty
(
playlist_t
*
,
playlist_item_t
*
);
void
ResetCurrentlyPlaying
(
playlist_t
*
p_playlist
,
playlist_item_t
*
p_cur
);
void
ResyncCurrentIndex
(
playlist_t
*
p_playlist
,
playlist_item_t
*
p_cur
);
...
...
src/playlist/tree.c
View file @
4630d8e2
...
...
@@ -86,26 +86,6 @@ playlist_item_t * playlist_NodeCreate( playlist_t *p_playlist,
return
p_item
;
}
/**
* Remove all the children of a node
*
* This function must be entered with the playlist lock
*
* \param p_playlist the playlist
* \param p_root the node
*/
void
playlist_NodeEmpty
(
playlist_t
*
p_playlist
,
playlist_item_t
*
p_root
)
{
PL_ASSERT_LOCKED
;
if
(
p_root
->
i_children
==
-
1
)
return
;
/* Delete the children */
for
(
int
i
=
p_root
->
i_children
-
1
;
i
>=
0
;
i
--
)
playlist_NodeDelete
(
p_playlist
,
p_root
->
pp_children
[
i
],
false
);
}
/**
* Remove all the children of a node and removes the node
*
...
...
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