X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fplaylist%2Floadsave.c;h=85a3e9eb8bb54d966038a385b86f574f99f280ec;hb=d6ee0fb364a634b1eba8e2db002430e2ed1ee6e1;hp=b1dc3abaa333e5bb70742690e9f4b97afec51038;hpb=8210d67fc5e51e0951dbad9b833b89a351bdb1f6;p=vlc diff --git a/src/playlist/loadsave.c b/src/playlist/loadsave.c index b1dc3abaa3..85a3e9eb8b 100644 --- a/src/playlist/loadsave.c +++ b/src/playlist/loadsave.c @@ -1,41 +1,41 @@ /***************************************************************************** * loadsave.c : Playlist loading / saving functions ***************************************************************************** - * Copyright (C) 1999-2004 the VideoLAN team + * Copyright (C) 1999-2004 VLC authors and VideoLAN * $Id$ * * Authors: Samuel Hocevar * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ #ifdef HAVE_CONFIG_H # include "config.h" #endif +#include +#include +#include + #include #include #include #include "playlist_internal.h" #include "config/configuration.h" -#include +#include #include - -#include -#include -#include -#include +#include int playlist_Export( playlist_t * p_playlist, const char *psz_filename, playlist_item_t *p_export_root, const char *psz_type ) @@ -43,12 +43,10 @@ int playlist_Export( playlist_t * p_playlist, const char *psz_filename, if( p_export_root == NULL ) return VLC_EGENERIC; playlist_export_t *p_export = - vlc_custom_create( p_playlist, sizeof( *p_export ), VLC_OBJECT_GENERIC, - "playlist export" ); + vlc_custom_create( p_playlist, sizeof( *p_export ), "playlist export" ); if( !p_export ) return VLC_ENOMEM; - vlc_object_attach( p_export, p_playlist ); msg_Dbg( p_export, "saving %s to file %s", p_export_root->p_input->psz_name, psz_filename ); @@ -57,7 +55,7 @@ int playlist_Export( playlist_t * p_playlist, const char *psz_filename, /* Prepare the playlist_export_t structure */ p_export->p_root = p_export_root; p_export->psz_filename = psz_filename; - p_export->p_file = utf8_fopen( psz_filename, "wt" ); + p_export->p_file = vlc_fopen( psz_filename, "wt" ); if( p_export->p_file == NULL ) msg_Err( p_export, "could not create playlist file %s (%m)", psz_filename ); @@ -87,117 +85,97 @@ int playlist_Import( playlist_t *p_playlist, const char *psz_file ) { input_item_t *p_input; const char *const psz_option = "meta-file"; - char *psz_uri = make_URI( psz_file ); + char *psz_uri = vlc_path2uri( psz_file, NULL ); if( psz_uri == NULL ) return VLC_EGENERIC; - p_input = input_item_NewExt( p_playlist, psz_uri, psz_file, + p_input = input_item_NewExt( 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 ); + return input_Read( p_playlist, p_input ); } /***************************************************************************** * A subitem has been added to the Media Library (Event Callback) *****************************************************************************/ -static void input_item_subitem_added( const vlc_event_t * p_event, +static void input_item_subitem_tree_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; + input_item_node_t *p_root = + p_event->u.input_item_subitem_tree_added.p_root; - /* 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 ); + PL_LOCK; + playlist_InsertInputItemTree ( p_playlist, p_playlist->p_media_library, + p_root, 0, false ); + PL_UNLOCK; } int playlist_MLLoad( playlist_t *p_playlist ) { - char *psz_datadir; - char *psz_uri = NULL; input_item_t *p_input; - if( !config_GetInt( p_playlist, "media-library") ) - return VLC_SUCCESS; - - psz_datadir = config_GetUserDir( VLC_DATA_DIR ); - + char *psz_datadir = config_GetUserDir( VLC_DATA_DIR ); 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.xspf", psz_datadir ) != -1 ) - { /* loosy check for media library file */ - struct stat st; - int ret = utf8_stat( psz_uri , &st ); - free( psz_uri ); - if( ret ) - { - free( psz_datadir ); - return VLC_EGENERIC; - } - } - - psz_uri = make_URI( psz_datadir ); + char *psz_file; + if( asprintf( &psz_file, "%s" DIR_SEP "ml.xspf", psz_datadir ) == -1 ) + psz_file = NULL; free( psz_datadir ); - psz_datadir = psz_uri; - if( psz_datadir == NULL ) + if( psz_file == NULL ) + return VLC_ENOMEM; + + /* lousy check for media library file */ + struct stat st; + if( vlc_stat( psz_file, &st ) ) + { + free( psz_file ); return VLC_EGENERIC; + } - /* Force XSPF demux (psz_datadir was a path, now it is a file URI) */ - if( asprintf( &psz_uri, "file/xspf-open%s/ml.xspf", psz_datadir+4 ) == -1 ) - psz_uri = NULL; - free( psz_datadir ); - psz_datadir = NULL; + char *psz_uri = vlc_path2uri( psz_file, "file/xspf-open" ); + free( psz_file ); if( psz_uri == NULL ) return VLC_ENOMEM; const char *const options[1] = { "meta-file", }; - /* that option has to be cleaned in input_item_subitem_added() */ + /* that option has to be cleaned in input_item_subitem_tree_added() */ /* vlc_gc_decref() in the same function */ - p_input = input_item_NewExt( p_playlist, psz_uri, _("Media Library"), + p_input = input_item_NewExt( psz_uri, _("Media Library"), 1, options, VLC_INPUT_OPTION_TRUSTED, -1 ); free( psz_uri ); if( p_input == NULL ) return VLC_EGENERIC; 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 ); + if( p_playlist->p_media_library->p_input ) + vlc_gc_decref( p_playlist->p_media_library->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 ); + p_playlist->p_media_library->p_input = p_input; - vlc_event_attach( &p_input->event_manager, vlc_InputItemSubItemAdded, - input_item_subitem_added, p_playlist ); + vlc_event_attach( &p_input->event_manager, vlc_InputItemSubItemTreeAdded, + input_item_subitem_tree_added, p_playlist ); 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, true ); - stats_TimerStop( p_playlist,STATS_TIMER_ML_LOAD ); + input_Read( p_playlist, p_input ); 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_event_detach( &p_input->event_manager, vlc_InputItemSubItemTreeAdded, + input_item_subitem_tree_added, p_playlist ); - vlc_gc_decref( p_input ); return VLC_SUCCESS; } @@ -205,9 +183,6 @@ int playlist_MLDump( playlist_t *p_playlist ) { char *psz_datadir; - if( !config_GetInt( p_playlist, "media-library") ) - return VLC_SUCCESS; - psz_datadir = config_GetUserDir( VLC_DATA_DIR ); if( !psz_datadir ) /* XXX: This should never happen */ @@ -226,10 +201,8 @@ int playlist_MLDump( playlist_t *p_playlist ) 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, + playlist_Export( p_playlist, psz_dirname, p_playlist->p_media_library, "export-xspf" ); - stats_TimerStop( p_playlist, STATS_TIMER_ML_DUMP ); return VLC_SUCCESS; }