Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
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-gpu
Commits
21702e21
Commit
21702e21
authored
May 30, 2008
by
Pierre d'Herbemont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
playlist: Make sure fetcher and preparser won't miss a vlc_object_kill().
parent
449e7059
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
6 deletions
+11
-6
src/playlist/engine.c
src/playlist/engine.c
+11
-6
No files found.
src/playlist/engine.c
View file @
21702e21
...
...
@@ -483,9 +483,10 @@ void playlist_PreparseLoop( playlist_preparse_t *p_obj )
input_item_t
*
p_current
;
int
i_activity
;
while
(
!
p_playlist
->
b_die
)
vlc_object_lock
(
p_obj
);
while
(
vlc_object_alive
(
p_obj
)
)
{
vlc_object_lock
(
p_obj
);
while
(
p_obj
->
i_waiting
==
0
)
{
if
(
vlc_object_wait
(
p_obj
)
||
p_playlist
->
b_die
)
...
...
@@ -556,7 +557,9 @@ void playlist_PreparseLoop( playlist_preparse_t *p_obj )
vlc_object_unlock
(
p_obj
);
/* Sleep at least 1ms */
msleep
(
(
i_activity
+
1
)
*
1000
);
vlc_object_lock
(
p_obj
);
}
vlc_object_unlock
(
p_obj
);
}
/**
...
...
@@ -572,13 +575,13 @@ void playlist_FetcherLoop( playlist_fetcher_t *p_obj )
input_item_t
*
p_item
;
int
i_activity
;
while
(
!
p_playlist
->
b_die
)
vlc_mutex_lock
(
&
p_obj
->
object_lock
);
while
(
vlc_object_alive
(
p_obj
)
)
{
vlc_mutex_lock
(
&
p_obj
->
object_lock
);
while
(
p_obj
->
i_waiting
==
0
)
{
vlc_cond_wait
(
&
p_obj
->
object_wait
,
&
p_obj
->
object_lock
);
if
(
p_playlist
->
b_die
)
if
(
vlc_object_wait
(
p_obj
)
||
p_playlist
->
b_die
)
{
vlc_mutex_unlock
(
&
p_obj
->
object_lock
);
return
;
...
...
@@ -638,7 +641,9 @@ void playlist_FetcherLoop( playlist_fetcher_t *p_obj )
vlc_object_unlock
(
p_obj
);
/* Sleep at least 1ms */
msleep
(
(
i_activity
+
1
)
*
1000
);
vlc_mutex_lock
(
&
p_obj
->
object_lock
);
}
vlc_mutex_unlock
(
&
p_obj
->
object_lock
);
}
static
void
VariablesInit
(
playlist_t
*
p_playlist
)
...
...
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