Changeset 0e3e5da42643cac283fc0e758147351635679abf

Timestamp:

05/14/08 22:28:20 (2 months ago)

Author:

Pierre d'Herbemont <pdherbemont@videolan.org>

git-committer:

Pierre d'Herbemont <pdherbemont@videolan.org> 1210796900 +0200

git-parent:

[5bfd7ba2d5743010ea14e1fc3afc6c36f3ba2adc]

git-author:

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

Message:

Revert "Remove playlist destructor"

This reverts commit 3d7eabaf80eb76dc2111f399aec6586d1b0094a8.

Signed-off-by: Pierre d'Herbemont <pdherbemont@videolan.org>

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,
@@ -154 +155 @@
-    p_playlist->b_auto_preparse = true;
-
+    vlc_object_set_destructor( p_playlist, playlist_Destructor );
+
-    return p_playlist;
-}
@@ -166 +169 @@
-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" );
@@ -178 +182 @@
-    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 );
-
-
+
-}
-