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
8e3288f9
Commit
8e3288f9
authored
Mar 24, 2013
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
playlist: remove impossible code
Nothing calls vlc_object_kill() on the playlist.
parent
07662edf
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
6 deletions
+1
-6
src/playlist/item.c
src/playlist/item.c
+1
-6
No files found.
src/playlist/item.c
View file @
8e3288f9
...
@@ -451,8 +451,7 @@ int playlist_AddInput( playlist_t* p_playlist, input_item_t *p_input,
...
@@ -451,8 +451,7 @@ int playlist_AddInput( playlist_t* p_playlist, input_item_t *p_input,
bool
b_locked
)
bool
b_locked
)
{
{
playlist_item_t
*
p_item
;
playlist_item_t
*
p_item
;
/* FIXME: use b_killed instead: */
if
(
!
vlc_object_alive
(
p_playlist
)
)
return
VLC_EGENERIC
;
if
(
!
pl_priv
(
p_playlist
)
->
b_doing_ml
)
if
(
!
pl_priv
(
p_playlist
)
->
b_doing_ml
)
PL_DEBUG
(
"adding item `%s' ( %s )"
,
p_input
->
psz_name
,
PL_DEBUG
(
"adding item `%s' ( %s )"
,
p_input
->
psz_name
,
p_input
->
psz_uri
);
p_input
->
psz_uri
);
...
@@ -494,10 +493,6 @@ playlist_item_t * playlist_NodeAddInput( playlist_t *p_playlist,
...
@@ -494,10 +493,6 @@ playlist_item_t * playlist_NodeAddInput( playlist_t *p_playlist,
assert
(
p_input
);
assert
(
p_input
);
assert
(
p_parent
&&
p_parent
->
i_children
!=
-
1
);
assert
(
p_parent
&&
p_parent
->
i_children
!=
-
1
);
/* FIXME: use b_killed instead: */
if
(
!
vlc_object_alive
(
p_playlist
)
)
return
NULL
;
PL_LOCK_IF
(
!
b_locked
);
PL_LOCK_IF
(
!
b_locked
);
p_item
=
playlist_ItemNewFromInput
(
p_playlist
,
p_input
);
p_item
=
playlist_ItemNewFromInput
(
p_playlist
,
p_input
);
...
...
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