libvlc: do not disable the playlist earlier automatically

diff --git a/src/libvlc.c b/src/libvlc.c
index 7dd511b6c2c37b6de3689ff8d349c53373ec95dc..bf5ae78945e00ab5a568cc66dd5bcf74c2b2428f 100644 (file)
--- 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 4419ba710689dcb077cfb973a92d310ac53d0a51..a9f1177bd7729ca56fb2f6f98fe1327934a8e1a6 100644 (file)
--- 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 466215f3c9a449a7279f8fa200b1fabb661ffa1f..efd3ebc1d1215f52b3ad529f0cc7b2865f971b07 100644 (file)
--- 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 fa2469ed9d3a1563bda2779bb9076e930abd7c46..7e6bede8c95ea380ea06c5214bac14f14817bc1f 100644 (file)
--- 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,