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
17b57777
Commit
17b57777
authored
Nov 13, 2011
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ncurses: fix mutex locking order
parent
4afbc70a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
2 deletions
+5
-2
modules/gui/ncurses.c
modules/gui/ncurses.c
+5
-2
No files found.
modules/gui/ncurses.c
View file @
17b57777
...
@@ -417,10 +417,8 @@ static void PlaylistRebuild(intf_thread_t *intf)
...
@@ -417,10 +417,8 @@ static void PlaylistRebuild(intf_thread_t *intf)
intf_sys_t
*
sys
=
intf
->
p_sys
;
intf_sys_t
*
sys
=
intf
->
p_sys
;
playlist_t
*
p_playlist
=
pl_Get
(
intf
);
playlist_t
*
p_playlist
=
pl_Get
(
intf
);
PL_LOCK
;
PlaylistDestroy
(
sys
);
PlaylistDestroy
(
sys
);
PlaylistAddNode
(
sys
,
p_playlist
->
p_root_onelevel
,
""
);
PlaylistAddNode
(
sys
,
p_playlist
->
p_root_onelevel
,
""
);
PL_UNLOCK
;
}
}
static
int
ItemChanged
(
vlc_object_t
*
p_this
,
const
char
*
variable
,
static
int
ItemChanged
(
vlc_object_t
*
p_this
,
const
char
*
variable
,
...
@@ -955,12 +953,14 @@ static int DrawPlaylist(intf_thread_t *intf)
...
@@ -955,12 +953,14 @@ static int DrawPlaylist(intf_thread_t *intf)
intf_sys_t
*
sys
=
intf
->
p_sys
;
intf_sys_t
*
sys
=
intf
->
p_sys
;
playlist_t
*
p_playlist
=
pl_Get
(
intf
);
playlist_t
*
p_playlist
=
pl_Get
(
intf
);
PL_LOCK
;
vlc_mutex_lock
(
&
sys
->
pl_lock
);
vlc_mutex_lock
(
&
sys
->
pl_lock
);
if
(
sys
->
need_update
)
{
if
(
sys
->
need_update
)
{
PlaylistRebuild
(
intf
);
PlaylistRebuild
(
intf
);
sys
->
need_update
=
false
;
sys
->
need_update
=
false
;
}
}
vlc_mutex_unlock
(
&
sys
->
pl_lock
);
vlc_mutex_unlock
(
&
sys
->
pl_lock
);
PL_UNLOCK
;
if
(
sys
->
plidx_follow
)
if
(
sys
->
plidx_follow
)
FindIndex
(
sys
,
p_playlist
);
FindIndex
(
sys
,
p_playlist
);
...
@@ -1795,6 +1795,7 @@ static int Open(vlc_object_t *p_this)
...
@@ -1795,6 +1795,7 @@ static int Open(vlc_object_t *p_this)
{
{
intf_thread_t
*
intf
=
(
intf_thread_t
*
)
p_this
;
intf_thread_t
*
intf
=
(
intf_thread_t
*
)
p_this
;
intf_sys_t
*
sys
=
intf
->
p_sys
=
calloc
(
1
,
sizeof
(
intf_sys_t
));
intf_sys_t
*
sys
=
intf
->
p_sys
=
calloc
(
1
,
sizeof
(
intf_sys_t
));
playlist_t
*
p_playlist
=
pl_Get
(
p_this
);
if
(
!
sys
)
if
(
!
sys
)
return
VLC_ENOMEM
;
return
VLC_ENOMEM
;
...
@@ -1831,7 +1832,9 @@ static int Open(vlc_object_t *p_this)
...
@@ -1831,7 +1832,9 @@ static int Open(vlc_object_t *p_this)
msg_Err
(
intf
,
"Couldn't close stderr (%m)"
);
msg_Err
(
intf
,
"Couldn't close stderr (%m)"
);
ReadDir
(
intf
);
ReadDir
(
intf
);
PL_LOCK
;
PlaylistRebuild
(
intf
),
PlaylistRebuild
(
intf
),
PL_UNLOCK
;
intf
->
pf_run
=
Run
;
intf
->
pf_run
=
Run
;
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
...
...
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