Changeset 3d7eabaf80eb76dc2111f399aec6586d1b0094a8

Timestamp:

05/14/08 21:39:21 (2 months ago)

Author:

Rafaël Carré <funman@videolan.org>

git-committer:

Rafaël Carré <funman@videolan.org> 1210793961 +0200

git-parent:

[bb84da65bde754021ec602e99e3861b7e8ebafa3]

git-author:

Rafaël Carré <funman@videolan.org> 1210793961 +0200

Message:

Remove playlist destructor

We need to do stuff BEFORE the playlist is destroyed

Files:

• src/playlist/engine.c (modified) (4 diffs)

src/playlist/engine.c

@@ -39 +39 @@
- *****************************************************************************/
-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,
@@ -155 +154 @@
-    p_playlist->b_auto_preparse = true;
-
-    vlc_object_set_destructor( p_playlist, playlist_Destructor );
-
-    return p_playlist;
-}
@@ -169 +166 @@
-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" );
@@ -182 +178 @@
-    var_Destroy( p_playlist, "activity" );
-
+    if( p_playlist->p_preparse )
+        vlc_object_release( p_playlist->p_preparse );
+    if( p_playlist->p_fetcher )
+        vlc_object_release( p_playlist->p_fetcher );
+
-    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 );
-    }
-}
-