X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fplaylist%2Floadsave.c;h=10660f80cabbc0897d8bf9de114495e9b467c87b;hb=10a6bde56813620846826fed6979b2548a6457ea;hp=2d48375da53628eb64a10ff7e0fefae0c9cb3a72;hpb=e116212be98182d07378ae9a2400db4af80ced6b;p=vlc diff --git a/src/playlist/loadsave.c b/src/playlist/loadsave.c index 2d48375da5..10660f80ca 100644 --- a/src/playlist/loadsave.c +++ b/src/playlist/loadsave.c @@ -20,10 +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. *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include #include +#include #include "playlist_internal.h" -#include "modules/configuration.h" +#include "config/configuration.h" #include #include @@ -45,51 +50,62 @@ int playlist_Export( playlist_t * p_playlist, const char *psz_filename , /* Prepare the playlist_export_t structure */ p_export = (playlist_export_t *)malloc( sizeof(playlist_export_t) ); if( !p_export) - { - msg_Err( p_playlist, "out of memory" ); return VLC_ENOMEM; - } p_export->psz_filename = NULL; if ( psz_filename ) p_export->psz_filename = strdup( psz_filename ); p_export->p_file = utf8_fopen( psz_filename, "wt" ); if( !p_export->p_file ) { - msg_Err( p_playlist , "could not create playlist file %s" - " (%s)", psz_filename, strerror(errno) ); + msg_Err( p_playlist , "could not create playlist file %s (%m)", + psz_filename ); return VLC_EGENERIC; } p_export->p_root = p_export_root; /* Lock the playlist */ - vlc_mutex_lock( &p_playlist->object_lock ); + vlc_object_lock( p_playlist ); 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" ); - vlc_mutex_unlock( &p_playlist->object_lock ); + vlc_object_unlock( p_playlist ); return VLC_ENOOBJ; } module_Unneed( p_playlist , p_module ); /* 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 ); + 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 ) { - const char *psz_datadir = p_playlist->p_libvlc->psz_datadir; + char *psz_datadir = config_GetUserDataDir(); char *psz_uri = NULL; input_item_t *p_input; @@ -100,7 +116,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; @@ -108,45 +124,69 @@ int playlist_MLLoad( playlist_t *p_playlist ) struct stat p_stat; /* checks if media library file is present */ if( utf8_stat( psz_uri , &p_stat ) ) - { - free( psz_uri ); - return VLC_EGENERIC; - } + goto error; free( psz_uri ); - if( asprintf( &psz_uri, "file/xspf-open://%s" DIR_SEP "ml.xsp", + /* 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"), 0, NULL, -1 ); + _("Media Library"), 1, &psz_option, -1 ); if( p_input == NULL ) goto error; - /* FIXME [21574] pdherbemont do we need *install_input_item_observer ? */ - playlist_AddInput( p_playlist, p_input, PLAYLIST_APPEND, 0, VLC_FALSE, - VLC_FALSE ); + 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; - p_playlist->b_doing_ml = VLC_TRUE; 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; error: free( psz_uri ); + free( psz_datadir ); return VLC_ENOMEM; } int playlist_MLDump( playlist_t *p_playlist ) { - char *psz_datadir = p_playlist->p_libvlc->psz_datadir; + char *psz_datadir = config_GetUserDataDir(); if( !config_GetInt( p_playlist, "media-library") ) return VLC_SUCCESS; if( !psz_datadir ) /* XXX: This should never happen */ { @@ -154,15 +194,15 @@ 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 ); + free( 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,