Commit fdbda6fe authored by Rémi Duraffort's avatar Rémi Duraffort Committed by Rémi Denis-Courmont

m3u: use the album art provided by jamendo along with the m3u files.

parent d4c7ef27
...@@ -136,6 +136,7 @@ static int Demux( demux_t *p_demux ) ...@@ -136,6 +136,7 @@ static int Demux( demux_t *p_demux )
char *psz_line; char *psz_line;
char *psz_name = NULL; char *psz_name = NULL;
char *psz_artist = NULL; char *psz_artist = NULL;
char *psz_album_art = NULL;
int i_parsed_duration = 0; int i_parsed_duration = 0;
mtime_t i_duration = -1; mtime_t i_duration = -1;
const char**ppsz_options = NULL; const char**ppsz_options = NULL;
...@@ -194,6 +195,14 @@ static int Demux( demux_t *p_demux ) ...@@ -194,6 +195,14 @@ static int Demux( demux_t *p_demux )
INSERT_ELEM( ppsz_options, i_options, i_options, INSERT_ELEM( ppsz_options, i_options, i_options,
psz_option ); psz_option );
} }
/* Special case for jamendo which provide the albumart */
else if( !strncasecmp( psz_parse, "EXTALBUMARTURL:",
sizeof( "EXTALBUMARTURL:" ) -1 ) )
{
psz_parse += sizeof( "EXTALBUMARTURL:" ) - 1;
free( psz_album_art );
psz_album_art = pf_dup( psz_parse );
}
} }
else if( !strncasecmp( psz_parse, "RTSPtext", sizeof("RTSPtext") -1 ) ) else if( !strncasecmp( psz_parse, "RTSPtext", sizeof("RTSPtext") -1 ) )
{ {
...@@ -226,6 +235,8 @@ static int Demux( demux_t *p_demux ) ...@@ -226,6 +235,8 @@ static int Demux( demux_t *p_demux )
if ( psz_artist && *psz_artist ) if ( psz_artist && *psz_artist )
input_item_SetArtist( p_input, psz_artist ); input_item_SetArtist( p_input, psz_artist );
if( psz_name ) input_item_SetTitle( p_input, psz_name ); if( psz_name ) input_item_SetTitle( p_input, psz_name );
if( !EMPTY_STR(psz_album_art) )
input_item_SetArtURL( p_input, psz_album_art );
input_item_node_AppendItem( p_subitems, p_input ); input_item_node_AppendItem( p_subitems, p_input );
vlc_gc_decref( p_input ); vlc_gc_decref( p_input );
...@@ -248,6 +259,8 @@ static int Demux( demux_t *p_demux ) ...@@ -248,6 +259,8 @@ static int Demux( demux_t *p_demux )
psz_name = NULL; psz_name = NULL;
free( psz_artist ); free( psz_artist );
psz_artist = NULL; psz_artist = NULL;
free( psz_album_art );
psz_album_art = NULL;
i_parsed_duration = 0; i_parsed_duration = 0;
i_duration = -1; i_duration = -1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment