if( p_export_root == NULL ) return VLC_EGENERIC;
- msg_Info( p_playlist, "saving %s to file %s",
+ msg_Dbg( p_playlist, "saving %s to file %s",
p_export_root->p_input->psz_name, 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->psz_filename = psz_filename ? strdup( psz_filename ) : NULL;
p_export->p_file = utf8_fopen( psz_filename, "wt" );
if( !p_export->p_file )
{
msg_Err( p_playlist , "could not create playlist file %s (%m)",
psz_filename );
+ free( p_export->psz_filename );
+ free( p_export );
return VLC_EGENERIC;
}
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, true);
+ int i_ret;
+ p_module = module_need( p_playlist, "playlist export", psz_type, true);
if( !p_module )
{
msg_Warn( p_playlist, "exporting playlist failed" );
- vlc_object_unlock( p_playlist );
- return VLC_ENOOBJ;
+ i_ret = VLC_ENOOBJ;
+ }
+ else
+ {
+ module_unneed( p_playlist , p_module );
+ i_ret = VLC_SUCCESS;
}
- module_Unneed( p_playlist , p_module );
/* Clean up */
fclose( p_export->p_file );
free( p_export->psz_filename );
- free ( p_export );
+ free( p_export );
p_playlist->p_private = NULL;
vlc_object_unlock( p_playlist );
- return VLC_SUCCESS;
+ return i_ret;
}
/*****************************************************************************
/* 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, false );
+ false, pl_Unlocked );
}
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,
+ p_input = input_item_NewExt( p_playlist, psz_uri,
_("Media Library"), 1, &psz_option, -1 );
if( p_input == NULL )
goto error;
vlc_event_attach( &p_input->event_manager, vlc_InputItemSubItemAdded,
input_item_subitem_added, p_playlist );
- p_playlist->b_doing_ml = true;
+ pl_priv(p_playlist)->b_doing_ml = true;
PL_UNLOCK;
stats_TimerStart( p_playlist, "ML Load", STATS_TIMER_ML_LOAD );
stats_TimerStop( p_playlist,STATS_TIMER_ML_LOAD );
PL_LOCK;
- p_playlist->b_doing_ml = false;
+ pl_priv(p_playlist)->b_doing_ml = false;
PL_UNLOCK;
vlc_event_detach( &p_input->event_manager, vlc_InputItemSubItemAdded,