playlist_item_t *p_export_root,const char *psz_type )
{
module_t *p_module;
- playlist_export_t *p_export;
+ playlist_export_t export;
if( p_export_root == NULL ) return VLC_EGENERIC;
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)
- return VLC_ENOMEM;
- p_export->psz_filename = psz_filename ? strdup( psz_filename ) : NULL;
- p_export->p_file = utf8_fopen( psz_filename, "wt" );
- if( !p_export->p_file )
+ export.psz_filename = psz_filename ? strdup( psz_filename ) : NULL;
+ export.p_file = utf8_fopen( psz_filename, "wt" );
+ if( export.p_file == NULL )
{
msg_Err( p_playlist , "could not create playlist file %s (%m)",
psz_filename );
- free( p_export->psz_filename );
- free( p_export );
+ free( export.psz_filename );
return VLC_EGENERIC;
}
- p_export->p_root = p_export_root;
+ export.p_root = p_export_root;
- /* Lock the playlist */
- vlc_object_lock( p_playlist );
- p_playlist->p_private = (void *)p_export;
+ playlist_Lock( p_playlist );
+ p_playlist->p_private = (void *)&export;
/* And call the module ! All work is done now */
- int i_ret;
p_module = module_need( p_playlist, "playlist export", psz_type, true);
if( !p_module )
- {
msg_Warn( p_playlist, "exporting playlist failed" );
- i_ret = VLC_ENOOBJ;
- }
else
- {
module_unneed( p_playlist , p_module );
- i_ret = VLC_SUCCESS;
- }
+ p_playlist->p_private = NULL;
+ playlist_Unlock( p_playlist );
/* Clean up */
- fclose( p_export->p_file );
- free( p_export->psz_filename );
- free( p_export );
- p_playlist->p_private = NULL;
- vlc_object_unlock( p_playlist );
+ fclose( export.p_file );
+ free( export.psz_filename );
- return i_ret;
+ return p_module ? VLC_SUCCESS : VLC_ENOOBJ;
}
int playlist_Import( playlist_t *p_playlist, const char *psz_file )
int playlist_MLLoad( playlist_t *p_playlist )
{
- char *psz_datadir = config_GetUserDataDir();
+ char *psz_datadir;
char *psz_uri = NULL;
input_item_t *p_input;
- if( !config_GetInt( p_playlist, "media-library") ) return VLC_SUCCESS;
+ if( !config_GetInt( p_playlist, "media-library") )
+ return VLC_SUCCESS;
+
+ psz_datadir = config_GetUserDataDir();
+
if( !psz_datadir ) /* XXX: This should never happen */
{
msg_Err( p_playlist, "no data directory, cannot load media library") ;
int playlist_MLDump( playlist_t *p_playlist )
{
- char *psz_datadir = config_GetUserDataDir();
- if( !config_GetInt( p_playlist, "media-library") ) return VLC_SUCCESS;
+ char *psz_datadir;
+
+ if( !config_GetInt( p_playlist, "media-library") )
+ return VLC_SUCCESS;
+
+ psz_datadir = config_GetUserDataDir();
+
if( !psz_datadir ) /* XXX: This should never happen */
{
- msg_Err( p_playlist, "no data directory, cannot save media library");
+ 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" ) + 1];
+ 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 ) )