Skip to content

V
vlc
Commit 521c492a authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

cdda: recognise vlc_input_item_AddInfo()'s order, so we show our artist correctly in CDDB mode

parent 9b8461c6
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 6 deletions
modules/access/cdda.c
View file @ 521c492a
...@@ -622,9 +622,8 @@ static int GetTracks( access_t *p_access, vlc_bool_t b_separate, ...@@ -622,9 +622,8 @@ static int GetTracks( access_t *p_access, vlc_bool_t b_separate,
/* If we have CDDB info, change the name */ /* If we have CDDB info, change the name */
if( p_sys->p_disc ) if( p_sys->p_disc )
{ {
char *psz_result;
cddb_track_t *t = cddb_disc_get_track( p_sys->p_disc, i ); cddb_track_t *t = cddb_disc_get_track( p_sys->p_disc, i );
if( t!= NULL ) if( t != NULL )
{ {
if( cddb_track_get_title( t ) != NULL ) if( cddb_track_get_title( t ) != NULL )
{ {
...@@ -636,12 +635,12 @@ static int GetTracks( access_t *p_access, vlc_bool_t b_separate, ...@@ -636,12 +635,12 @@ static int GetTracks( access_t *p_access, vlc_bool_t b_separate,
free( p_item->input.psz_name ); free( p_item->input.psz_name );
p_item->input.psz_name = strdup( cddb_track_get_title( t ) ); p_item->input.psz_name = strdup( cddb_track_get_title( t ) );
} }
psz_result = cddb_track_get_artist( t ); if( cddb_track_get_artist( t ) != NULL )
if( psz_result )
{ {
vlc_input_item_AddInfo( &p_item->input, vlc_input_item_AddInfo( &p_item->input,
_(VLC_META_INFO_CAT), "%s", _(VLC_META_INFO_CAT),
_(VLC_META_ARTIST), psz_result ); _(VLC_META_ARTIST), "%s",
cddb_track_get_artist( t ) );
} }
} }
} }
......
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