* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.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>
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;
- 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->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( export.psz_filename );
return VLC_EGENERIC;
}
- p_export->p_root = p_export_root;
+ export.p_root = p_export_root;
- /* Lock the playlist */
- vlc_mutex_lock( &p_playlist->object_lock );
- 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 */
- 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 );
- return VLC_ENOOBJ;
- }
- module_Unneed( p_playlist , p_module );
+ else
+ module_unneed( p_playlist , p_module );
+ p_playlist->p_private = NULL;
+ playlist_Unlock( p_playlist );
/* Clean up */
- fclose( p_export->p_file );
- if ( p_export->psz_filename )
- free( p_export->psz_filename );
- free ( p_export );
- p_playlist->p_private = NULL;
- vlc_mutex_unlock( &p_playlist->object_lock );
+ fclose( export.p_file );
+ free( export.psz_filename );
- return VLC_SUCCESS;
+ return p_module ? VLC_SUCCESS : VLC_ENOOBJ;
+}
+
+int playlist_Import( playlist_t *p_playlist, const char *psz_file )
+{
+ input_item_t *p_input;
+ char *psz_uri;
+ const char *const psz_option = "meta-file";
+
+ if( asprintf( &psz_uri, "file/://%s", psz_file ) < 0 )
+ return VLC_EGENERIC;
+
+ p_input = input_item_NewExt( p_playlist, psz_uri, psz_file,
+ 1, &psz_option, VLC_INPUT_OPTION_TRUSTED, -1 );
+ free( psz_uri );
+
+ playlist_AddInput( p_playlist, p_input, PLAYLIST_APPEND, PLAYLIST_END,
+ true, false );
+ return input_Read( p_playlist, p_input, true );
}
/*****************************************************************************
playlist_t *p_playlist = user_data;
input_item_t *p_item = p_event->u.input_item_subitem_added.p_new_child;
- /* The media library input has one and only one option: "meta-file"
- * So we remove that unneeded option. */
- if( p_item->i_options == 1 )
- {
- free( p_item->ppsz_options[0] );
- p_item->i_options = 0;
- }
-
+ /* 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, pl_Unlocked );
}
int playlist_MLLoad( playlist_t *p_playlist )
{
- const char *psz_datadir = p_playlist->p_libvlc->psz_datadir;
+ 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") ;
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 );
+ /* 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() */
- p_input = input_ItemNewExt( p_playlist, psz_uri,
- _("Media Library"), 1, &psz_option, -1 );
+ /* vlc_gc_decref() in the same function */
+ p_input = input_item_NewExt( p_playlist, psz_uri, _("Media Library"),
+ 1, &psz_option, VLC_INPUT_OPTION_TRUSTED, -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;
+ pl_priv(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;
+ pl_priv(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;
- 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") ;
return VLC_EGENERIC;
}
- char psz_dirname[ strlen( psz_datadir )
- + sizeof( DIR_SEP "ml.xspf")];
- 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;
projects / vlc / blobdiff