[vlc-commits] libvlc: do not disable the playlist earlier automatically

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Nov 26 23:20:59 2012 +0200| [33af9b687708d32761cd3a8c66ae986fb92df71f] | committer: Rémi Denis-Courmont

libvlc: do not disable the playlist earlier automatically

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=33af9b687708d32761cd3a8c66ae986fb92df71f
---

 src/libvlc.c                     |    4 ----
 src/playlist/control.c           |   12 ------------
 src/playlist/engine.c            |    1 +
 src/playlist/playlist_internal.h |    1 -
 4 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/src/libvlc.c b/src/libvlc.c
index 7dd511b..bf5ae78 100644
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -599,10 +599,6 @@ void libvlc_InternalCleanup( libvlc_int_t *p_libvlc )
     libvlc_priv_t *priv = libvlc_priv (p_libvlc);
     playlist_t    *p_playlist = libvlc_priv (p_libvlc)->p_playlist;
 
-    /* Deactivate the playlist */
-    msg_Dbg( p_libvlc, "deactivating the playlist" );
-    pl_Deactivate( p_libvlc );
-
     /* Remove all services discovery */
     msg_Dbg( p_libvlc, "removing all services discovery tasks" );
     playlist_ServicesDiscoveryKillAll( p_playlist );
diff --git a/src/playlist/control.c b/src/playlist/control.c
index 4419ba7..a9f1177 100644
--- a/src/playlist/control.c
+++ b/src/playlist/control.c
@@ -60,18 +60,6 @@ playlist_t *pl_Get (vlc_object_t *obj)
     return pl;
 }
 
-void pl_Deactivate (libvlc_int_t *p_libvlc)
-{
-    bool deactivate;
-
-    vlc_mutex_lock (&global_lock);
-    deactivate = libvlc_priv (p_libvlc)->playlist_active;
-    vlc_mutex_unlock (&global_lock);
-
-    if (deactivate)
-        playlist_Deactivate (libvlc_priv (p_libvlc)->p_playlist);
-}
-
 void playlist_Lock( playlist_t *pl )
 {
     vlc_mutex_lock( &pl_priv(pl)->lock );
diff --git a/src/playlist/engine.c b/src/playlist/engine.c
index 466215f..efd3ebc 100644
--- a/src/playlist/engine.c
+++ b/src/playlist/engine.c
@@ -314,6 +314,7 @@ void playlist_Destroy( playlist_t *p_playlist )
 
     msg_Dbg( p_playlist, "destroying" );
 
+    playlist_Deactivate( p_playlist );
     if( p_sys->p_preparser )
         playlist_preparser_Delete( p_sys->p_preparser );
     if( p_sys->p_fetcher )
diff --git a/src/playlist/playlist_internal.h b/src/playlist/playlist_internal.h
index fa2469e..7e6bede 100644
--- a/src/playlist/playlist_internal.h
+++ b/src/playlist/playlist_internal.h
@@ -104,7 +104,6 @@ void playlist_Destroy( playlist_t * );
 
 /* */
 void playlist_Activate( playlist_t * );
-void pl_Deactivate (libvlc_int_t *);
 
 /* */
 playlist_item_t *playlist_ItemNewFromInput( playlist_t *p_playlist,