+ free( p_export->psz_filename );
+ free ( p_export );
+ p_playlist->p_private = NULL;
+ vlc_object_unlock( p_playlist );
+
+ return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * A subitem has been added to the Media Library (Event Callback)
+ *****************************************************************************/
+static void input_item_subitem_added( const vlc_event_t * p_event,
+ void * user_data )
+{
+ 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,
+ false, pl_Unlocked );
+}
+
+int playlist_MLLoad( playlist_t *p_playlist )
+{
+ char *psz_datadir = config_GetUserDataDir();
+ char *psz_uri = NULL;
+ input_item_t *p_input;
+
+ if( !config_GetInt( p_playlist, "media-library") ) return VLC_SUCCESS;
+ if( !psz_datadir ) /* XXX: This should never happen */
+ {
+ msg_Err( p_playlist, "no data directory, cannot load media library") ;
+ return VLC_EGENERIC;
+ }
+
+ if( asprintf( &psz_uri, "%s" DIR_SEP "ml.xspf", psz_datadir ) == -1 )
+ {
+ psz_uri = NULL;
+ goto error;
+ }
+ struct stat p_stat;
+ /* checks if media library file is present */
+ if( utf8_stat( psz_uri , &p_stat ) )
+ goto error;
+ free( psz_uri );
+
+ /* FIXME: WTF? stat() should never be used right before open()! */
+ if( asprintf( &psz_uri, "file/xspf-open://%s" DIR_SEP "ml.xspf",
+ psz_datadir ) == -1 )
+ {
+ psz_uri = NULL;
+ goto error;
+ }
+ free( psz_datadir );
+ psz_datadir = NULL;
+
+ 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 = true;
+ PL_UNLOCK;
+
+ stats_TimerStart( p_playlist, "ML Load", STATS_TIMER_ML_LOAD );
+ input_Read( p_playlist, p_input, true );
+ stats_TimerStop( p_playlist,STATS_TIMER_ML_LOAD );
+
+ 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;
+
+error:
+ free( psz_uri );
+ free( psz_datadir );
+ return VLC_ENOMEM;
+}
+
+int playlist_MLDump( playlist_t *p_playlist )
+{
+ char *psz_datadir = config_GetUserDataDir();
+ if( !config_GetInt( p_playlist, "media-library") ) return VLC_SUCCESS;
+ if( !psz_datadir ) /* XXX: This should never happen */
+ {
+ msg_Err( p_playlist, "no data directory, cannot save media library") ;
+ return VLC_EGENERIC;
+ }
+
+ char psz_dirname[ strlen( psz_datadir ) + sizeof( DIR_SEP "ml.xspf")];
+ strcpy( psz_dirname, psz_datadir );
+ free( psz_datadir );
+ if( config_CreateDir( (vlc_object_t *)p_playlist, psz_dirname ) )
+ {
+ return VLC_EGENERIC;
+ }
+
+ strcat( psz_dirname, DIR_SEP "ml.xspf" );