[vlc-devel] commit: Respect album-art for CDDB request. (Laurent Aimar )

[git version control]

vlc | branch: 1.0-bugfix | Laurent Aimar <fenrir at videolan.org> | Fri May 15 23:52:25 2009 +0200| [cd2fbd0ad4f24067a848f0532e1d55db67d6fa3c] | committer: Laurent Aimar 

Respect album-art for CDDB request.

In this case the option is a bit mis-named but...

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=cd2fbd0ad4f24067a848f0532e1d55db67d6fa3c
---

 modules/access/cdda.c        |    3 +++
 modules/access/cdda/access.c |    1 +
 2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/modules/access/cdda.c b/modules/access/cdda.c
index d8d0f2d..bddbfbf 100644
--- a/modules/access/cdda.c
+++ b/modules/access/cdda.c
@@ -604,6 +604,9 @@ static int GetTracks( access_t *p_access, input_item_t *p_current )
 #ifdef HAVE_LIBCDDB
 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();
     if( !p_cddb )
diff --git a/modules/access/cdda/access.c b/modules/access/cdda/access.c
index 19c986c..90f6735 100644
--- a/modules/access/cdda/access.c
+++ b/modules/access/cdda/access.c
@@ -644,6 +644,7 @@ int CDDAOpen( vlc_object_t *p_this )
     cddb_log_set_handler ( cddb_log_handler );
     p_cdda->cddb.disc = NULL;
     p_cdda->b_cddb_enabled =
+        var_CreateGetInteger( p_access, "album-art" ) != ALBUM_ART_WHEN_ASKED &&
         config_GetInt( p_access, MODULE_STRING "-cddb-enabled" );
 #endif
     p_cdda->b_cdtext =