* Copyright (C) 2004 the VideoLAN team
* $Id$
*
- * Authors: Clément Stenac <zorglub@videolan.org>
+ * Authors: Clément Stenac <zorglub@videolan.org>
*
* 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
*
* 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., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* malloc(), free() */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
#include <vlc/vlc.h>
-#include <vlc/intf.h>
+#include <vlc_interface.h>
+#include <vlc_playlist.h>
+#include <vlc_input.h>
+#include <vlc_meta.h>
#include <errno.h> /* ENOMEM */
+#include <assert.h>
+
/*****************************************************************************
* Local prototypes
*****************************************************************************/
/*****************************************************************************
* Export_M3U: main export function
*****************************************************************************/
-int Export_M3U( vlc_object_t *p_this )
+static void DoChildren( playlist_t *p_playlist, playlist_export_t *p_export,
+ playlist_item_t *p_root )
{
- playlist_t *p_playlist = (playlist_t*)p_this;
- playlist_export_t *p_export = (playlist_export_t *)p_playlist->p_private;
int i, j;
- msg_Dbg(p_playlist, "Saving using M3U format");
-
- /* Write header */
- fprintf( p_export->p_file, "#EXTM3U\n" );
-
/* Go through the playlist and add items */
- for( i = 0; i< p_playlist->i_size ; i++)
+ for( i = 0; i< p_root->i_children ; i++)
{
- if( (p_playlist->pp_items[i]->i_flags & PLAYLIST_SAVE_FLAG) == 0 )
+ playlist_item_t *p_current = p_root->pp_children[i];
+ assert( p_current );
+
+ if( p_current->i_flags & PLAYLIST_SAVE_FLAG )
+ continue;
+
+ if( p_current->i_children >= 0 )
{
+ DoChildren( p_playlist, p_export, p_current );
continue;
}
/* General info */
- if( p_playlist->pp_items[i]->input.psz_name &&
- strcmp( p_playlist->pp_items[i]->input.psz_name,
- p_playlist->pp_items[i]->input.psz_uri ) )
+
+ char *psz_uri = input_item_GetURI( p_current->p_input );
+
+ assert( psz_uri );
+
+ char *psz_name = input_item_GetName( p_current->p_input );
+ if( psz_name && strcmp( psz_uri, psz_name ) )
{
- char *psz_author =
- vlc_input_item_GetInfo( &p_playlist->pp_items[i]->input,
- _("Meta-information"), _("Artist") );
- if( psz_author && *psz_author )
+ char *psz_artist = input_item_GetArtist( p_current->p_input );
+ if( psz_artist == NULL ) psz_artist = strdup( "" );
+ mtime_t i_duration = input_item_GetDuration( p_current->p_input );
+ if( psz_artist && *psz_artist )
{
- /* the author must be escaped if it contains a comma */
- char *p_src; short i_cnt;
- /* so count the commas or backslash */
- for( i_cnt = 0, p_src = psz_author; *p_src; p_src++ )
- if(*p_src == ',' || *p_src == '\\' )
- i_cnt++;
- /* Is there a comma ? */
- if( i_cnt )
- {
- char *psz_escaped=NULL;
- char *p_dst;
- psz_escaped = (char *)malloc( ( strlen( psz_author )
- + i_cnt + 1 ) * sizeof( char ) );
- if( !psz_escaped )
- return VLC_ENOMEM;
- /* copy the string and escape every comma with backslash */
- for( p_src=psz_author, p_dst=psz_escaped; *p_src;
- p_src++, p_dst++ )
- {
- if( *p_src == ',' || *p_src == '\\' )
- *p_dst++ = '\\';
- *p_dst = *p_src;
- }
- *p_dst = '\0';
- free( psz_author);
- psz_author = psz_escaped;
- }
- fprintf( p_export->p_file, "#EXTINF:%i,%s,%s\n",
- (int)(p_playlist->pp_items[i]->input.i_duration/1000000),
- psz_author,
- p_playlist->pp_items[i]->input.psz_name );
+ /* write EXTINF with artist */
+ fprintf( p_export->p_file, "#EXTINF:%i,%s - %s\n",
+ (int)( i_duration / 1000000 ), psz_artist, psz_name);
}
else
{
- /* write EXTINF without author */
- fprintf( p_export->p_file, "#EXTINF:%i,,%s\n",
- (int)(p_playlist->pp_items[i]->input.i_duration/1000000),
- p_playlist->pp_items[i]->input.psz_name );
+ /* write EXTINF without artist */
+ fprintf( p_export->p_file, "#EXTINF:%i,%s\n",
+ (int)( i_duration / 1000000 ), psz_name);
}
- if( psz_author )
- free( psz_author );
+ free( psz_artist );
}
+ free( psz_name );
/* VLC specific options */
- for( j = 0; j < p_playlist->pp_items[i]->input.i_options; j++ )
+ vlc_mutex_lock( &p_current->p_input->lock );
+ for( j = 0; j < p_current->p_input->i_options; j++ )
{
fprintf( p_export->p_file, "#EXTVLCOPT:%s\n",
- p_playlist->pp_items[i]->input.ppsz_options[j][0] == ':' ?
- p_playlist->pp_items[i]->input.ppsz_options[j] + 1 :
- p_playlist->pp_items[i]->input.ppsz_options[j] );
+ p_current->p_input->ppsz_options[j][0] == ':' ?
+ p_current->p_input->ppsz_options[j] + 1 :
+ p_current->p_input->ppsz_options[j] );
}
+ vlc_mutex_unlock( &p_current->p_input->lock );
- fprintf( p_export->p_file, "%s\n",
- p_playlist->pp_items[i]->input.psz_uri );
+ fprintf( p_export->p_file, "%s\n", psz_uri );
+ free( psz_uri );
}
+}
+
+int Export_M3U( vlc_object_t *p_this )
+{
+ playlist_t *p_playlist = (playlist_t*)p_this;
+ playlist_export_t *p_export = (playlist_export_t *)p_playlist->p_private;
+
+ msg_Dbg(p_playlist, "saving using M3U format");
+
+ /* Write header */
+ fprintf( p_export->p_file, "#EXTM3U\n" );
+
+ DoChildren( p_playlist, p_export, p_export->p_root );
return VLC_SUCCESS;
}
projects / vlc / blobdiff