diff options
| author | Michael Roitzsch <mroi@users.sourceforge.net> | 2004-05-11 21:21:39 +0000 |
|---|---|---|
| committer | Michael Roitzsch <mroi@users.sourceforge.net> | 2004-05-11 21:21:39 +0000 |
| commit | e638e457592a4d0f27af5c45b5dcbbdf78343918 (patch) | |
| tree | 734b342737f35608f701a3da9697d377783ac046 | |
| parent | 5e208f3399471a2205c22cf1e94a8b86825f3e1d (diff) | |
| download | xine-lib-e638e457592a4d0f27af5c45b5dcbbdf78343918.tar.gz xine-lib-e638e457592a4d0f27af5c45b5dcbbdf78343918.tar.bz2 | |
use the CDDB cache directory, even when CDDB queries are disabled
CVS patchset: 6519
CVS date: 2004/05/11 21:21:39
| -rw-r--r-- | src/input/input_cdda.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c index 8b2b88ddd..090e92c17 100644 --- a/src/input/input_cdda.c +++ b/src/input/input_cdda.c @@ -20,7 +20,7 @@ * Compact Disc Digital Audio (CDDA) Input Plugin * by Mike Melanson (melanson@pcisys.net) * - * $Id: input_cdda.c,v 1.54 2004/05/05 09:16:59 hadess Exp $ + * $Id: input_cdda.c,v 1.55 2004/05/11 21:21:39 mroi Exp $ */ #ifdef HAVE_CONFIG_H @@ -1413,6 +1413,8 @@ static int _cdda_load_cached_cddb_infos(cdda_input_plugin_t *this) { return 1; } } + xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, + "input_cdda: cached entry for disc ID %08lx not found.\n", this->cddb.disc_id); closedir(dir); } @@ -1499,7 +1501,7 @@ static int _cdda_cddb_retrieve(cdda_input_plugin_t *this) { this->cddb.have_cddb_info = 1; return 1; } - if(this_class->cddb_error) { + if(!this->cddb.enabled || this_class->cddb_error) { this->cddb.have_cddb_info = 0; return 0; } @@ -2216,7 +2218,7 @@ static int cdda_plugin_open (input_plugin_t *this_gen ) { toc->leadout_track.first_frame_second); this->cddb.disc_id = _cdda_get_cddb_id(this); - if(this->cddb.enabled && ((this->cddb.have_cddb_info == 0) || (_cdda_is_cd_changed(this) == 1))) + if((this->cddb.have_cddb_info == 0) || (_cdda_is_cd_changed(this) == 1)) _cdda_cddb_retrieve(this); if(this->cddb.disc_title) { |