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
bc35aea3
Commit
bc35aea3
authored
May 14, 2008
by
Rafaël Carré
Committed by
Pierre d'Herbemont
May 14, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use vlc_object_release() to release the playlist
Signed-off-by:
Pierre d'Herbemont
<
pdherbemont@videolan.org
>
parent
0e3e5da4
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
1 addition
and
39 deletions
+1
-39
src/libvlc-common.c
src/libvlc-common.c
+1
-1
src/playlist/engine.c
src/playlist/engine.c
+0
-23
src/playlist/playlist_internal.h
src/playlist/playlist_internal.h
+0
-2
src/playlist/thread.c
src/playlist/thread.c
+0
-13
No files found.
src/libvlc-common.c
View file @
bc35aea3
...
...
@@ -939,7 +939,7 @@ int libvlc_InternalCleanup( libvlc_int_t *p_libvlc )
/* Free playlist */
msg_Dbg
(
p_libvlc
,
"removing playlist"
);
playlist_ThreadDestroy
(
priv
->
p_playlist
);
vlc_object_release
(
priv
->
p_playlist
);
/* Free video outputs */
msg_Dbg
(
p_libvlc
,
"removing all video outputs"
);
...
...
src/playlist/engine.c
View file @
bc35aea3
...
...
@@ -166,39 +166,16 @@ playlist_t * playlist_Create( vlc_object_t *p_parent )
* \param p_playlist the playlist object
* \return nothing
*/
void
playlist_Destroy
(
playlist_t
*
p_playlist
)
{
/* XXX: should go in the playlist destructor */
var_Destroy
(
p_playlist
,
"intf-change"
);
var_Destroy
(
p_playlist
,
"item-change"
);
var_Destroy
(
p_playlist
,
"playlist-current"
);
var_Destroy
(
p_playlist
,
"intf-popupmenu"
);
var_Destroy
(
p_playlist
,
"intf-show"
);
var_Destroy
(
p_playlist
,
"play-and-stop"
);
var_Destroy
(
p_playlist
,
"play-and-exit"
);
var_Destroy
(
p_playlist
,
"random"
);
var_Destroy
(
p_playlist
,
"repeat"
);
var_Destroy
(
p_playlist
,
"loop"
);
var_Destroy
(
p_playlist
,
"activity"
);
vlc_object_release
(
p_playlist
);
}
static
void
playlist_Destructor
(
vlc_object_t
*
p_this
)
{
playlist_t
*
p_playlist
=
(
playlist_t
*
)
p_this
;
// Kill preparser
if
(
p_playlist
->
p_preparse
)
{
vlc_object_release
(
p_playlist
->
p_preparse
);
}
// Kill meta fetcher
if
(
p_playlist
->
p_fetcher
)
{
vlc_object_release
(
p_playlist
->
p_fetcher
);
}
}
/* Destroy remaining objects */
...
...
src/playlist/playlist_internal.h
View file @
bc35aea3
...
...
@@ -62,11 +62,9 @@ struct playlist_fetcher_t
/* Global thread */
#define playlist_ThreadCreate(a) __playlist_ThreadCreate(VLC_OBJECT(a))
void
__playlist_ThreadCreate
(
vlc_object_t
*
);
int
playlist_ThreadDestroy
(
playlist_t
*
);
/* Creation/Deletion */
playlist_t
*
playlist_Create
(
vlc_object_t
*
);
void
playlist_Destroy
(
playlist_t
*
);
/* Engine */
void
playlist_MainLoop
(
playlist_t
*
);
...
...
src/playlist/thread.c
View file @
bc35aea3
...
...
@@ -125,19 +125,6 @@ void __playlist_ThreadCreate( vlc_object_t *p_parent )
return
;
}
/**
* Destroy the playlist global thread.
*
* Deinits all things controlled by the playlist global thread
* \param p_playlist the playlist thread to destroy
* \return VLC_SUCCESS or an error
*/
int
playlist_ThreadDestroy
(
playlist_t
*
p_playlist
)
{
playlist_Destroy
(
p_playlist
);
return
VLC_SUCCESS
;
}
/**
* Run the main control thread itself
*/
...
...
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