Commit 0e3e5da4 authored by Rafaël Carré's avatar Rafaël Carré Committed by Pierre d'Herbemont
Browse files

Revert "Remove playlist destructor"

This reverts commit 3d7eabaf

.

Signed-off-by: default avatarPierre d'Herbemont <pdherbemont@videolan.org>
parent 5bfd7ba2
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
* Local prototypes * Local prototypes
*****************************************************************************/ *****************************************************************************/
static void VariablesInit( playlist_t *p_playlist ); static void VariablesInit( playlist_t *p_playlist );
static void playlist_Destructor( vlc_object_t * p_this );
static int RandomCallback( vlc_object_t *p_this, char const *psz_cmd, static int RandomCallback( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *a ) vlc_value_t oldval, vlc_value_t newval, void *a )
...@@ -153,6 +154,8 @@ playlist_t * playlist_Create( vlc_object_t *p_parent ) ...@@ -153,6 +154,8 @@ playlist_t * playlist_Create( vlc_object_t *p_parent )
playlist_MLLoad( p_playlist ); playlist_MLLoad( p_playlist );
p_playlist->b_auto_preparse = true; p_playlist->b_auto_preparse = true;
vlc_object_set_destructor( p_playlist, playlist_Destructor );
return p_playlist; return p_playlist;
} }
...@@ -165,6 +168,7 @@ playlist_t * playlist_Create( vlc_object_t *p_parent ) ...@@ -165,6 +168,7 @@ playlist_t * playlist_Create( vlc_object_t *p_parent )
*/ */
void playlist_Destroy( playlist_t *p_playlist ) void playlist_Destroy( playlist_t *p_playlist )
{ {
/* XXX: should go in the playlist destructor */
var_Destroy( p_playlist, "intf-change" ); var_Destroy( p_playlist, "intf-change" );
var_Destroy( p_playlist, "item-change" ); var_Destroy( p_playlist, "item-change" );
var_Destroy( p_playlist, "playlist-current" ); var_Destroy( p_playlist, "playlist-current" );
...@@ -177,12 +181,24 @@ void playlist_Destroy( playlist_t *p_playlist ) ...@@ -177,12 +181,24 @@ void playlist_Destroy( playlist_t *p_playlist )
var_Destroy( p_playlist, "loop" ); var_Destroy( p_playlist, "loop" );
var_Destroy( p_playlist, "activity" ); 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 ) if( p_playlist->p_preparse )
{
vlc_object_release( p_playlist->p_preparse ); vlc_object_release( p_playlist->p_preparse );
}
// Kill meta fetcher
if( p_playlist->p_fetcher ) if( p_playlist->p_fetcher )
{
vlc_object_release( p_playlist->p_fetcher ); vlc_object_release( p_playlist->p_fetcher );
}
vlc_object_release( p_playlist );
} }
/* Destroy remaining objects */ /* Destroy remaining objects */
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment