X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fplaylist%2Floadsave.c;h=e685d3b53199ee9c7bf1446157aee25e96bffb18;hb=d6a7e4898ec7aec075b0aeb056b3c883de7be60a;hp=4fb29536676de79c63f2e2dae1fc8746b64da9d3;hpb=59198c7ddb54e2193636425475ba46b09b135264;p=vlc

diff --git a/src/playlist/loadsave.c b/src/playlist/loadsave.c
index 4fb2953667..e685d3b531 100644
--- a/src/playlist/loadsave.c
+++ b/src/playlist/loadsave.c
@@ -20,11 +20,15 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/vlc.h>
 #include <vlc_playlist.h>
 #include <vlc_events.h>
 #include "playlist_internal.h"
-#include "modules/configuration.h"
+#include "config/configuration.h"
 #include <vlc_charset.h>
 
 #include <sys/types.h>
@@ -68,7 +72,7 @@ int playlist_Export( playlist_t * p_playlist, const char *psz_filename ,
     p_playlist->p_private = (void *)p_export;
 
     /* And call the module ! All work is done now */
-    p_module = module_Need( p_playlist, "playlist export", psz_type, VLC_TRUE);
+    p_module = module_Need( p_playlist, "playlist export", psz_type, true);
     if( !p_module )
     {
         msg_Warn( p_playlist, "exporting playlist failed" );
@@ -79,8 +83,7 @@ int playlist_Export( playlist_t * p_playlist, const char *psz_filename ,
 
     /* Clean up */
     fclose( p_export->p_file );
-    if ( p_export->psz_filename )
-        free( p_export->psz_filename );
+    free( p_export->psz_filename );
     free ( p_export );
     p_playlist->p_private = NULL;
     vlc_mutex_unlock( &p_playlist->object_lock );
@@ -96,13 +99,16 @@ static void input_item_subitem_added( const vlc_event_t * p_event,
 {
     playlist_t *p_playlist = user_data;
     input_item_t *p_item = p_event->u.input_item_subitem_added.p_new_child;
+
+    /* playlist_AddInput() can fail, but we have no way to report that ..
+     * Any way when it has failed, either the playlist is dying, either OOM */
     playlist_AddInput( p_playlist, p_item, PLAYLIST_APPEND, PLAYLIST_END,
-            VLC_FALSE, VLC_FALSE );
+            false, false );
 }
 
 int playlist_MLLoad( playlist_t *p_playlist )
 {
-    const char *psz_datadir = p_playlist->p_libvlc->psz_datadir;
+    const char *psz_datadir = libvlc_priv (p_playlist->p_libvlc)->psz_datadir;
     char *psz_uri = NULL;
     input_item_t *p_input;
 
@@ -113,7 +119,7 @@ int playlist_MLLoad( playlist_t *p_playlist )
         return VLC_EGENERIC;
     }
 
-    if( asprintf( &psz_uri, "%s" DIR_SEP "ml.xsp", psz_datadir ) == -1 )
+    if( asprintf( &psz_uri, "%s" DIR_SEP "ml.xspf", psz_datadir ) == -1 )
     {
         psz_uri = NULL;
         goto error;
@@ -127,7 +133,7 @@ int playlist_MLLoad( playlist_t *p_playlist )
     }
     free( psz_uri );
 
-    if( asprintf( &psz_uri, "file/xspf-open://%s" DIR_SEP "ml.xsp",
+    if( asprintf( &psz_uri, "file/xspf-open://%s" DIR_SEP "ml.xspf",
                   psz_datadir ) == -1 )
     {
         psz_uri = NULL;
@@ -135,26 +141,43 @@ int playlist_MLLoad( playlist_t *p_playlist )
     }
 
     const char *const psz_option = "meta-file";
+    /* that option has to be cleaned in input_item_subitem_added() */
+    /* vlc_gc_decref() in the same function */
     p_input = input_ItemNewExt( p_playlist, psz_uri,
                                 _("Media Library"), 1, &psz_option, -1 );
     if( p_input == NULL )
         goto error;
 
+    PL_LOCK;
+    if( p_playlist->p_ml_onelevel->p_input )
+        vlc_gc_decref( p_playlist->p_ml_onelevel->p_input );
+    if( p_playlist->p_ml_category->p_input )
+        vlc_gc_decref( p_playlist->p_ml_category->p_input );
+
     p_playlist->p_ml_onelevel->p_input =
     p_playlist->p_ml_category->p_input = p_input;
+    /* We save the input at two different place, incref */
+    vlc_gc_incref( p_input );
+    vlc_gc_incref( p_input );
 
     vlc_event_attach( &p_input->event_manager, vlc_InputItemSubItemAdded,
                         input_item_subitem_added, p_playlist );
 
-    p_playlist->b_doing_ml = VLC_TRUE;
+    p_playlist->b_doing_ml = true;
+    PL_UNLOCK;
+
     stats_TimerStart( p_playlist, "ML Load", STATS_TIMER_ML_LOAD );
-    input_Read( p_playlist, p_input, VLC_TRUE );
+    input_Read( p_playlist, p_input, true );
     stats_TimerStop( p_playlist,STATS_TIMER_ML_LOAD );
-    p_playlist->b_doing_ml = VLC_FALSE;
+
+    PL_LOCK;
+    p_playlist->b_doing_ml = false;
+    PL_UNLOCK;
 
     vlc_event_detach( &p_input->event_manager, vlc_InputItemSubItemAdded,
                         input_item_subitem_added, p_playlist );
 
+    vlc_gc_decref( p_input );
     free( psz_uri );
     return VLC_SUCCESS;
 
@@ -165,7 +188,7 @@ error:
 
 int playlist_MLDump( playlist_t *p_playlist )
 {
-    char *psz_datadir = p_playlist->p_libvlc->psz_datadir;
+    char *psz_datadir = libvlc_priv (p_playlist->p_libvlc)->psz_datadir;
     if( !config_GetInt( p_playlist, "media-library") ) return VLC_SUCCESS;
     if( !psz_datadir ) /* XXX: This should never happen */
     {
@@ -173,15 +196,14 @@ int playlist_MLDump( playlist_t *p_playlist )
         return VLC_EGENERIC;
     }
 
-    char psz_dirname[ strlen( psz_datadir )
-                      + sizeof( DIR_SEP "ml.xsl")];
-    sprintf( psz_dirname, "%s", psz_datadir );
+    char psz_dirname[ strlen( psz_datadir ) + sizeof( DIR_SEP "ml.xspf")];
+    strcpy( psz_dirname, psz_datadir );
     if( config_CreateDir( (vlc_object_t *)p_playlist, psz_dirname ) )
     {
         return VLC_EGENERIC;
     }
 
-    strcat( psz_dirname, DIR_SEP "ml.xsp" );
+    strcat( psz_dirname, DIR_SEP "ml.xspf" );
 
     stats_TimerStart( p_playlist, "ML Dump", STATS_TIMER_ML_DUMP );
     playlist_Export( p_playlist, psz_dirname, p_playlist->p_ml_category,