/*****************************************************************************
* m3u.c : M3U playlist format import
*****************************************************************************
- * Copyright (C) 2004 VideoLAN
+ * Copyright (C) 2004 the VideoLAN team
* $Id$
*
- * Authors: Clément Stenac <zorglub@videolan.org>
- * Sigmund Augdal <sigmunau@idi.ntnu.no>
+ * Authors: Clément Stenac <zorglub@videolan.org>
+ * Sigmund Augdal Helberg <dnumgis@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.
*****************************************************************************/
/*****************************************************************************
*****************************************************************************/
static int Demux( demux_t *p_demux);
static int Control( demux_t *p_demux, int i_query, va_list args );
+static void parseEXTINF( char *psz_string, char **ppsz_artist, char **ppsz_name, int *pi_duration );
/*****************************************************************************
* Import_M3U: main import function
*****************************************************************************/
-int Import_M3U( vlc_object_t *p_this )
+int E_(Import_M3U)( vlc_object_t *p_this )
{
demux_t *p_demux = (demux_t *)p_this;
}
psz_ext = strrchr ( p_demux->psz_path, '.' );
- if( !strncmp( p_peek, "#EXTM3U", 7 ) )
+ if( !strncmp( (char *)p_peek, "#EXTM3U", 7 ) )
{
;
}
msg_Err( p_demux, "Out of memory" );
return VLC_ENOMEM;
}
- p_demux->p_sys->psz_prefix = FindPrefix( p_demux );
+ p_demux->p_sys->psz_prefix = E_(FindPrefix)( p_demux );
return VLC_SUCCESS;
}
/*****************************************************************************
* Deactivate: frees unused data
*****************************************************************************/
-void Close_M3U( vlc_object_t *p_this )
+void E_(Close_M3U)( vlc_object_t *p_this )
{
demux_t *p_demux = (demux_t *)p_this;
playlist_t *p_playlist;
char *psz_line;
- char *psz_name = NULL;
- mtime_t i_duration = -1;
- char **ppsz_options = NULL;
- int i_options = 0, i;
+ char *psz_name = NULL;
+ char *psz_artist = NULL;
+ int i_parsed_duration = 0;
+ mtime_t i_duration = -1;
+ char **ppsz_options = NULL;
+ int i_options = 0, i;
playlist_item_t *p_item, *p_current;
vlc_bool_t b_cleanup = VLC_FALSE;
p_playlist = (playlist_t *) vlc_object_find( p_demux, VLC_OBJECT_PLAYLIST,
- FIND_PARENT );
+ FIND_ANYWHERE );
if( !p_playlist )
{
msg_Err( p_demux, "can't find playlist" );
return -1;
}
- b_play = FindItem( p_demux, p_playlist, &p_current );
+ b_play = E_(FindItem)( p_demux, p_playlist, &p_current );
playlist_ItemToNode( p_playlist, p_current );
p_current->input.i_type = ITEM_TYPE_PLAYLIST;
if( !strncasecmp( psz_parse, "EXTINF:", sizeof("EXTINF:") -1 ) )
{
/* Extended info */
- char *psz_duration;
psz_parse += sizeof("EXTINF:") - 1;
- while( *psz_parse == '\t' || *psz_parse == ' ' ) psz_parse++;
-
- psz_duration = psz_parse;
- psz_parse = strchr( psz_parse, ',' );
- if( psz_parse )
- {
- *psz_parse = '\0';
- psz_parse++;
- psz_name = strdup( psz_parse );
- i_duration = atoi( psz_duration );
- if( i_duration != -1 ) i_duration *= 1000000;
- }
+ parseEXTINF( psz_parse, &psz_artist, &psz_name, &i_parsed_duration );
+ if ( i_parsed_duration >= 0 )
+ i_duration = i_parsed_duration * 1000000;
+ if ( psz_name )
+ psz_name = strdup( psz_name );
+ if ( psz_artist )
+ psz_artist = strdup( psz_artist );
}
else if( !strncasecmp( psz_parse, "EXTVLCOPT:",
sizeof("EXTVLCOPT:") -1 ) )
-
{
/* VLC Option */
char *psz_option;
psz_name = strdup( psz_parse );
}
- psz_mrl = ProcessMRL( psz_parse, p_demux->p_sys->psz_prefix );
+ psz_mrl = E_(ProcessMRL)( psz_parse, p_demux->p_sys->psz_prefix );
b_cleanup = VLC_TRUE;
if( !psz_mrl ) goto error;
+ EnsureUTF8( psz_name );
+ EnsureUTF8( psz_mrl );
+
p_item = playlist_ItemNew( p_playlist, psz_mrl, psz_name );
for( i = 0; i< i_options; i++ )
{
+ EnsureUTF8( ppsz_options[i] );
playlist_ItemAddOption( p_item, ppsz_options[i] );
}
p_item->input.i_duration = i_duration;
-
+ if ( psz_artist && *psz_artist )
+ vlc_input_item_AddInfo( &p_item->input, _(VLC_META_INFO_CAT),
+ _(VLC_META_ARTIST), "%s", psz_artist );
playlist_NodeAddItem( p_playlist, p_item,
p_current->pp_parents[0]->i_view,
p_current, PLAYLIST_APPEND,
ppsz_options = NULL; i_options = 0;
if( psz_name ) free( psz_name );
psz_name = NULL;
+ if ( psz_artist ) free( psz_artist );
+ psz_artist = NULL;
+ i_parsed_duration = 0;
i_duration = -1;
b_cleanup = VLC_FALSE;
{
return VLC_EGENERIC;
}
+
+static void parseEXTINF(char *psz_string, char **ppsz_artist,
+ char **ppsz_name, int *pi_duration)
+{
+ char *end = NULL;
+ char *psz_item = NULL;
+
+ end = psz_string + strlen( psz_string );
+
+ /* ignore whitespaces */
+ for (; psz_string < end && ( *psz_string == '\t' || *psz_string == ' ' );
+ psz_string++ );
+
+ /* duration: read to next comma */
+ psz_item = psz_string;
+ psz_string = strchr( psz_string, ',' );
+ if ( psz_string )
+ {
+ *psz_string = '\0';
+ *pi_duration = atoi( psz_item );
+ }
+ else
+ {
+ return;
+ }
+
+ if ( psz_string < end ) /* continue parsing if possible */
+ psz_string++;
+
+ /* analyse the remaining string */
+ psz_item = strstr( psz_string, " - " );
+
+ /* here we have the 0.8.2+ format with artist */
+ if ( psz_item )
+ {
+ /* *** "EXTINF:time,artist - name" */
+ *psz_item = '\0';
+ *ppsz_artist = psz_string;
+ *ppsz_name = psz_item + 3; /* points directly after ' - ' */
+ return;
+ }
+
+ /* reaching this point means: 0.8.1- with artist or something without artist */
+ if ( *psz_string == ',' )
+ {
+ /* *** "EXTINF:time,,name" */
+ psz_string++;
+ *ppsz_name = psz_string;
+ return;
+ }
+
+ psz_item = psz_string;
+ psz_string = strchr( psz_string, ',' );
+ if ( psz_string )
+ {
+ /* *** "EXTINF:time,artist,name" */
+ *psz_string = '\0';
+ *ppsz_artist = psz_item;
+ *ppsz_name = psz_string+1;
+ }
+ else
+ {
+ /* *** "EXTINF:time,name" */
+ *ppsz_name = psz_item;
+ }
+ return;
+}
+
projects / vlc / blobdiff