Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
1fac4d77
Commit
1fac4d77
authored
Jul 13, 2008
by
Pierre d'Herbemont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
playlist: Fix input item deletion (stupid macros), and don't send to the fetcher if it is dead.
Fix #1704
parent
564cbeae
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
8 deletions
+13
-8
src/playlist/engine.c
src/playlist/engine.c
+13
-8
No files found.
src/playlist/engine.c
View file @
1fac4d77
...
@@ -582,10 +582,15 @@ void playlist_PreparseLoop( playlist_preparse_t *p_obj )
...
@@ -582,10 +582,15 @@ void playlist_PreparseLoop( playlist_preparse_t *p_obj )
{
{
PL_DEBUG
(
"meta ok for %s, need to fetch art"
,
psz_name
);
PL_DEBUG
(
"meta ok for %s, need to fetch art"
,
psz_name
);
vlc_object_lock
(
p_playlist
->
p_fetcher
);
vlc_object_lock
(
p_playlist
->
p_fetcher
);
INSERT_ELEM
(
p_playlist
->
p_fetcher
->
pp_waiting
,
if
(
vlc_object_alive
(
p_playlist
->
p_fetcher
)
)
p_playlist
->
p_fetcher
->
i_waiting
,
{
p_playlist
->
p_fetcher
->
i_waiting
,
p_current
);
INSERT_ELEM
(
p_playlist
->
p_fetcher
->
pp_waiting
,
vlc_object_signal_unlocked
(
p_playlist
->
p_fetcher
);
p_playlist
->
p_fetcher
->
i_waiting
,
p_playlist
->
p_fetcher
->
i_waiting
,
p_current
);
vlc_object_signal_unlocked
(
p_playlist
->
p_fetcher
);
}
else
vlc_gc_decref
(
p_current
);
vlc_object_unlock
(
p_playlist
->
p_fetcher
);
vlc_object_unlock
(
p_playlist
->
p_fetcher
);
}
}
else
else
...
@@ -610,9 +615,9 @@ void playlist_PreparseLoop( playlist_preparse_t *p_obj )
...
@@ -610,9 +615,9 @@ void playlist_PreparseLoop( playlist_preparse_t *p_obj )
vlc_object_lock
(
p_obj
);
vlc_object_lock
(
p_obj
);
}
}
for
(
int
i
=
0
;
i
<
p_obj
->
i_waiting
;
i
++
)
while
(
p_obj
->
i_waiting
>
0
)
{
{
vlc_gc_decref
(
p_obj
->
pp_waiting
[
i
]
);
vlc_gc_decref
(
p_obj
->
pp_waiting
[
0
]
);
REMOVE_ELEM
(
p_obj
->
pp_waiting
,
p_obj
->
i_waiting
,
0
);
REMOVE_ELEM
(
p_obj
->
pp_waiting
,
p_obj
->
i_waiting
,
0
);
}
}
...
@@ -698,9 +703,9 @@ void playlist_FetcherLoop( playlist_fetcher_t *p_obj )
...
@@ -698,9 +703,9 @@ void playlist_FetcherLoop( playlist_fetcher_t *p_obj )
vlc_object_lock
(
p_obj
);
vlc_object_lock
(
p_obj
);
}
}
for
(
int
i
=
0
;
i
<
p_obj
->
i_waiting
;
i
++
)
while
(
p_obj
->
i_waiting
>
0
)
{
{
vlc_gc_decref
(
p_obj
->
pp_waiting
[
i
]
);
vlc_gc_decref
(
p_obj
->
pp_waiting
[
0
]
);
REMOVE_ELEM
(
p_obj
->
pp_waiting
,
p_obj
->
i_waiting
,
0
);
REMOVE_ELEM
(
p_obj
->
pp_waiting
,
p_obj
->
i_waiting
,
0
);
}
}
...
...
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