Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
90a6e085
Commit
90a6e085
authored
Jul 28, 2008
by
ivoire
Browse files
upnp_intel: Fix playlist locking.
parent
67cc1732
Changes
1
Hide whitespace changes
Inline
Side-by-side
modules/services_discovery/upnp_intel.cpp
View file @
90a6e085
...
...
@@ -309,10 +309,12 @@ static void Close( vlc_object_t *p_this )
services_discovery_t
*
p_sd
=
(
services_discovery_t
*
)
p_this
;
services_discovery_sys_t
*
p_sys
=
p_sd
->
p_sys
;
vlc_object_lock
(
p_sys
->
p_playlist
);
playlist_NodeDelete
(
pl_Get
(
p_sd
),
p_sys
->
p_node_one
,
true
,
true
);
playlist_NodeDelete
(
pl_Get
(
p_sd
),
p_sys
->
p_node_cat
,
true
,
true
);
vlc_object_unlock
(
p_sys
->
p_playlist
);
pl_Release
(
p_sd
);
free
(
p_sys
);
}
...
...
@@ -629,8 +631,10 @@ MediaServer::~MediaServer()
{
if
(
_contents
)
{
vlc_object_lock
(
_cookie
->
serviceDiscovery
->
p_sys
->
p_playlist
);
playlist_NodeDelete
(
pl_Get
(
_cookie
->
serviceDiscovery
)
,
_playlistNode
,
true
,
true
);
vlc_object_unlock
(
_cookie
->
serviceDiscovery
->
p_sys
->
p_playlist
);
}
delete
_contents
;
...
...
@@ -927,9 +931,12 @@ bool MediaServerList::addServer( MediaServer* s )
_list
.
push_back
(
s
);
char
*
name
=
strdup
(
s
->
getFriendlyName
()
);
playlist_item_t
*
node
=
playlist_NodeCreate
(
pl_Get
(
_cookie
->
serviceDiscovery
),
name
,
_cookie
->
serviceDiscovery
->
p_sys
->
p_node_cat
,
0
,
NULL
);
vlc_object_lock
(
_cookie
->
serviceDiscovery
->
p_sys
->
p_playlist
);
playlist_item_t
*
node
=
playlist_NodeCreate
(
pl_Get
(
_cookie
->
serviceDiscovery
),
name
,
_cookie
->
serviceDiscovery
->
p_sys
->
p_node_cat
,
0
,
NULL
);
vlc_object_unlock
(
_cookie
->
serviceDiscovery
->
p_sys
->
p_playlist
);
free
(
name
);
s
->
setPlaylistNode
(
node
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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