Don't error out on handling "NO PRE_EMPHASIS" in cdrdao TOC.

Savannah bug #34826:
This commit is contained in:
R. Bernstein
2011-11-16 20:36:22 -05:00
parent c0315f0d80
commit e0b2ee826d
9 changed files with 22 additions and 12 deletions

View File

@@ -44,7 +44,7 @@
#define DATA_DIR "@abs_top_srcdir@/test/data"
#endif
#define NUM_GOOD_TOCS 16
#define NUM_GOOD_TOCS 17
#define NUM_BAD_TOCS 8
int
main(int argc, const char *argv[])
@@ -60,6 +60,7 @@ main(int argc, const char *argv[])
"t7.toc",
"t8.toc",
"t9.toc",
"t10.toc",
"data1.toc",
"data2.toc",
"data5.toc",
@@ -92,13 +93,16 @@ main(int argc, const char *argv[])
cdio_loglevel_default = verbose ? CDIO_LOG_DEBUG : CDIO_LOG_WARN;
for (i=0; i<NUM_GOOD_TOCS; i++) {
CdIo_t *p_cdio;
snprintf(psz_tocfile, sizeof(psz_tocfile)-1,
"%s/%s", DATA_DIR, toc_file[i]);
if (!cdio_is_tocfile(psz_tocfile)) {
if (!cdio_is_tocfile(psz_tocfile) ||
!(p_cdio = cdio_open_cdrdao(psz_tocfile))) {
fprintf(stderr,
"Incorrect: %s doesn't parse as a cdrdao TOC file.\n", toc_file[i]);
ret=i+1;
} else {
cdio_destroy(p_cdio);
if (verbose)
printf("Correct: %s parses as a cdrdao TOC file.\n",
toc_file[i]);