Changeset bc35aea3a1f6c84524c56e8da7610a6edaadb0e3

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:

[0e3e5da42643cac283fc0e758147351635679abf]

git-author:

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

Message:

Use vlc_object_release() to release the playlist

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

Files:

• src/libvlc-common.c (modified) (1 diff)
• src/playlist/engine.c (modified) (2 diffs)
• src/playlist/playlist_internal.h (modified) (1 diff)
• src/playlist/thread.c (modified) (1 diff)

src/libvlc-common.c

@@ -940 +940 @@
-    /* Free playlist */
-    msg_Dbg( p_libvlc, "removing playlist" );
-playlist_ThreadDestroy
+vlc_object_release
-
-    /* Free video outputs */

src/playlist/engine.c

@@ -167 +167 @@
- * \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 )
@@ -189 +172 @@
-    playlist_t * p_playlist = (playlist_t *)p_this;
-
-    // Kill preparser
-    if( p_playlist->p_preparse )
-    {
-        vlc_object_release( p_playlist->p_preparse );
-
-
-
+
-    if( p_playlist->p_fetcher )
-    {
-        vlc_object_release( p_playlist->p_fetcher );
-    }
-}
-

src/playlist/playlist_internal.h

@@ -63 +63 @@
-#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 */

src/playlist/thread.c

@@ -127 +127 @@
-
-/**
- * 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
- */