Skip to content

V
vlc-1.1
Commit 56a8c2a5 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

cdda: correctly display Title and Artist in CDDB mode, if available

parent 5ad459b5
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 8 deletions
modules/access/cdda.c
View file @ 56a8c2a5
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
#include <vlc/vlc.h> #include <vlc/vlc.h>
#include <vlc_input.h> #include <vlc_input.h>
#include <vlc_access.h> #include <vlc_access.h>
#include <vlc_meta.h>
#include <vlc_codecs.h> /* For WAVEHEADER */ #include <vlc_codecs.h> /* For WAVEHEADER */
#include "vcd/cdrom.h" #include "vcd/cdrom.h"
...@@ -468,24 +469,19 @@ static int GetTracks( access_t *p_access, ...@@ -468,24 +469,19 @@ static int GetTracks( access_t *p_access,
/* 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 )
{ {
const 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 )
{ {
input_ItemAddInfo( p_input_item, _(VLC_META_INFO_CAT),
_(VLC_META_TITLE),
"%s", cddb_track_get_title( t ) );
if( p_input_item->psz_name ) if( p_input_item->psz_name )
free( p_input_item->psz_name ); free( p_input_item->psz_name );
p_input_item->psz_name = strdup( cddb_track_get_title( t ) ); p_input_item->psz_name = strdup( cddb_track_get_title( t ) );
input_item_SetTitle( p_input_item, cddb_track_get_title( t ) );
} }
psz_result = cddb_track_get_artist( t ); if( cddb_track_get_artist( t ) != NULL )
if( psz_result )
{ {
input_ItemAddInfo( p_input_item, _(VLC_META_INFO_CAT), input_item_SetArtist( p_input_item, cddb_track_get_artist( t ) );
_(VLC_META_ARTIST), "%s", psz_result );
} }
} }
} }
......
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