Nuke cddb disc ID if --no-cddb option is given.

This commit is contained in:
rocky
2008-09-09 14:44:25 +00:00
parent d38c6ce8c1
commit c02aa93af6

View File

@@ -1,5 +1,5 @@
/* /*
$Id: cd-info.c,v 1.155 2008/09/08 14:45:12 rocky Exp $ $Id: cd-info.c,v 1.156 2008/09/09 14:44:25 rocky Exp $
Copyright (C) 2003, 2004, 2005, 2007, 2008 Rocky Bernstein <rocky@gnu.org> Copyright (C) 2003, 2004, 2005, 2007, 2008 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 1996, 1997, 1998 Gerd Knorr <kraxel@bytesex.org> Copyright (C) 1996, 1997, 1998 Gerd Knorr <kraxel@bytesex.org>
@@ -630,9 +630,11 @@ print_analysis(int ms_offset, cdio_iso_analysis_t cdio_iso_analysis,
case CDIO_FS_AUDIO: case CDIO_FS_AUDIO:
if (num_audio > 0) { if (num_audio > 0) {
#ifdef HAVE_CDDB #ifdef HAVE_CDDB
if (!opts.no_cddb) {
printf("Audio CD, CDDB disc ID is %08x\n", printf("Audio CD, CDDB disc ID is %08x\n",
cddb_discid(p_cdio, i_tracks)); cddb_discid(p_cdio, i_tracks));
if (!opts.no_cddb) print_cddb_info(p_cdio, i_tracks, i_first_track); print_cddb_info(p_cdio, i_tracks, i_first_track);
}
#endif #endif
print_cdtext_info(p_cdio, i_tracks, i_first_track); print_cdtext_info(p_cdio, i_tracks, i_first_track);
} }