Commit cd2fbd0a authored by Laurent Aimar's avatar Laurent Aimar

Respect album-art for CDDB request.

In this case the option is a bit mis-named but...
parent 10524df5
...@@ -604,6 +604,9 @@ static int GetTracks( access_t *p_access, input_item_t *p_current ) ...@@ -604,6 +604,9 @@ static int GetTracks( access_t *p_access, input_item_t *p_current )
#ifdef HAVE_LIBCDDB #ifdef HAVE_LIBCDDB
static cddb_disc_t *GetCDDBInfo( access_t *p_access, int i_titles, int *p_sectors ) static cddb_disc_t *GetCDDBInfo( access_t *p_access, int i_titles, int *p_sectors )
{ {
if( var_CreateGetInteger( p_access, "album-art" ) == ALBUM_ART_WHEN_ASKED )
return NULL;
/* */ /* */
cddb_conn_t *p_cddb = cddb_new(); cddb_conn_t *p_cddb = cddb_new();
if( !p_cddb ) if( !p_cddb )
......
...@@ -644,6 +644,7 @@ int CDDAOpen( vlc_object_t *p_this ) ...@@ -644,6 +644,7 @@ int CDDAOpen( vlc_object_t *p_this )
cddb_log_set_handler ( cddb_log_handler ); cddb_log_set_handler ( cddb_log_handler );
p_cdda->cddb.disc = NULL; p_cdda->cddb.disc = NULL;
p_cdda->b_cddb_enabled = p_cdda->b_cddb_enabled =
var_CreateGetInteger( p_access, "album-art" ) != ALBUM_ART_WHEN_ASKED &&
config_GetInt( p_access, MODULE_STRING "-cddb-enabled" ); config_GetInt( p_access, MODULE_STRING "-cddb-enabled" );
#endif #endif
p_cdda->b_cdtext = p_cdda->b_cdtext =
......
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