*****************************************************************************/
#include <vlc/vlc.h>
#include <vlc_playlist.h>
+#include <vlc_events.h>
#include "playlist_internal.h"
#include "modules/configuration.h"
#include <vlc_charset.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
#include <errno.h>
int playlist_Export( playlist_t * p_playlist, const char *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;
}
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;
+
+ /* The media library input has one and only one option: "meta-file"
+ * So we remove that unneeded option. */
+ free( p_item->ppsz_options[0] );
+ p_item->i_options = 0;
+
+ playlist_AddInput( p_playlist, p_item, PLAYLIST_APPEND, PLAYLIST_END,
+ VLC_FALSE, VLC_FALSE );
+}
+
int playlist_MLLoad( playlist_t *p_playlist )
{
-#ifndef THIS_PIECE_OF_CODE_IS_FIXED // see #1047 and possibly others
- (void)p_playlist;
-#else
- char *psz_uri, *psz_homedir =p_playlist->p_libvlc->psz_homedir;
+ const char *psz_datadir = p_playlist->p_libvlc->psz_datadir;
+ char *psz_uri = NULL;
input_item_t *p_input;
if( !config_GetInt( p_playlist, "media-library") ) return VLC_SUCCESS;
- if( !psz_homedir )
+ 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.xsp", 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 ) )
{
- msg_Err( p_playlist, "no home directory, cannot load media library") ;
+ free( psz_uri );
return VLC_EGENERIC;
}
- asprintf( &psz_uri, "file/xspf-open://%s" DIR_SEP CONFIG_DIR DIR_SEP
- "ml.xsp", psz_homedir );
+ free( psz_uri );
+
+ if( asprintf( &psz_uri, "file/xspf-open://%s" DIR_SEP "ml.xsp",
+ psz_datadir ) == -1 )
+ {
+ psz_uri = NULL;
+ goto error;
+ }
+ 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"), 0, NULL, -1 );
+ _("Media Library"), 1, &psz_option, -1 );
+ if( p_input == NULL )
+ goto error;
+
+ p_playlist->p_ml_onelevel->p_input =
p_playlist->p_ml_category->p_input = p_input;
- p_playlist->p_ml_onelevel->p_input = p_input;
+
+ vlc_event_attach( &p_input->event_manager, vlc_InputItemSubItemAdded,
+ input_item_subitem_added, p_playlist );
p_playlist->b_doing_ml = VLC_TRUE;
stats_TimerStart( p_playlist, "ML Load", STATS_TIMER_ML_LOAD );
stats_TimerStop( p_playlist,STATS_TIMER_ML_LOAD );
p_playlist->b_doing_ml = VLC_FALSE;
+ vlc_event_detach( &p_input->event_manager, vlc_InputItemSubItemAdded,
+ input_item_subitem_added, p_playlist );
+
free( psz_uri );
-#endif
return VLC_SUCCESS;
+
+error:
+ free( psz_uri );
+ return VLC_ENOMEM;
}
int playlist_MLDump( playlist_t *p_playlist )
{
- char *psz_uri, *psz_homedir = p_playlist->p_libvlc->psz_homedir;
+ char *psz_datadir = p_playlist->p_libvlc->psz_datadir;
if( !config_GetInt( p_playlist, "media-library") ) return VLC_SUCCESS;
- if( !psz_homedir )
+ if( !psz_datadir ) /* XXX: This should never happen */
{
- msg_Err( p_playlist, "no home directory, cannot save media library") ;
+ msg_Err( p_playlist, "no data directory, cannot save media library") ;
return VLC_EGENERIC;
}
- char psz_dirname[ strlen( psz_homedir ) + sizeof( DIR_SEP CONFIG_DIR ) ];
- sprintf( psz_dirname, "%s" DIR_SEP CONFIG_DIR, psz_homedir );
+ char psz_dirname[ strlen( psz_datadir )
+ + sizeof( DIR_SEP "ml.xsl")];
+ sprintf( psz_dirname, "%s", psz_datadir );
if( config_CreateDir( (vlc_object_t *)p_playlist, psz_dirname ) )
{
return VLC_EGENERIC;
}
- asprintf( &psz_uri, "%s" DIR_SEP "%s", psz_dirname, "ml.xsp" );
+ strcat( psz_dirname, DIR_SEP "ml.xsp" );
+
stats_TimerStart( p_playlist, "ML Dump", STATS_TIMER_ML_DUMP );
- playlist_Export( p_playlist, psz_uri, p_playlist->p_ml_category,
+ playlist_Export( p_playlist, psz_dirname, p_playlist->p_ml_category,
"export-xspf" );
stats_TimerStop( p_playlist, STATS_TIMER_ML_DUMP );
- free( psz_uri );
return VLC_SUCCESS;
}