|
Line
Link Here
|
| 0 |
-- src/cdaudio-ng/cdaudio-ng.c |
0 |
++ src/cdaudio-ng/cdaudio-ng.c |
|
Lines 627-649
Link Here
|
| 627 |
} |
632 |
} |
| 628 |
|
633 |
|
| 629 |
/* get trackinfo[0] cdtext information (the disc) */ |
634 |
/* get trackinfo[0] cdtext information (the disc) */ |
|
|
635 |
cdtext_t *pcdtext = NULL; |
| 630 |
if (aud_get_bool ("CDDA", "use_cdtext")) |
636 |
if (aud_get_bool ("CDDA", "use_cdtext")) |
| 631 |
{ |
637 |
{ |
| 632 |
AUDDBG ("getting cd-text information for disc\n"); |
638 |
AUDDBG ("getting cd-text information for disc\n"); |
| 633 |
cdtext_t *pcdtext = cdio_get_cdtext (pcdrom_drive->p_cdio, 0); |
639 |
#if LIBCDIO_VERSION_NUM >= 90 |
|
|
640 |
pcdtext = cdio_get_cdtext (pcdrom_drive->p_cdio); |
| 641 |
if (pcdtext == NULL) |
| 642 |
#else |
| 643 |
pcdtext = cdio_get_cdtext (pcdrom_drive->p_cdio, 0); |
| 634 |
if (pcdtext == NULL || pcdtext->field[CDTEXT_TITLE] == NULL) |
644 |
if (pcdtext == NULL || pcdtext->field[CDTEXT_TITLE] == NULL) |
|
|
645 |
#endif |
| 635 |
{ |
646 |
{ |
| 636 |
AUDDBG ("no cd-text available for disc\n"); |
647 |
AUDDBG ("no cd-text available for disc\n"); |
| 637 |
} |
648 |
} |
| 638 |
else |
649 |
else |
| 639 |
{ |
650 |
{ |
| 640 |
cdaudio_set_strinfo (&trackinfo[0], |
651 |
cdaudio_set_strinfo (&trackinfo[0], |
| 641 |
pcdtext->field[CDTEXT_PERFORMER] ? pcdtext-> |
652 |
#if LIBCDIO_VERSION_NUM >= 90 |
| 642 |
field[CDTEXT_PERFORMER] : "", |
653 |
cdtext_get(pcdtext, CDTEXT_FIELD_PERFORMER, 0), |
| 643 |
pcdtext->field[CDTEXT_TITLE] ? pcdtext-> |
654 |
cdtext_get(pcdtext, CDTEXT_FIELD_TITLE, 0), |
| 644 |
field[CDTEXT_TITLE] : "", |
655 |
cdtext_get(pcdtext, CDTEXT_FIELD_GENRE, 0)); |
| 645 |
pcdtext->field[CDTEXT_GENRE] ? pcdtext-> |
656 |
#else |
| 646 |
field[CDTEXT_GENRE] : ""); |
657 |
pcdtext->field[CDTEXT_PERFORMER], |
|
|
658 |
pcdtext->field[CDTEXT_TITLE], |
| 659 |
pcdtext->field[CDTEXT_GENRE]); |
| 660 |
#endif |
| 647 |
} |
661 |
} |
| 648 |
} |
662 |
} |
| 649 |
|
663 |
|
|
Lines 651-657
Link Here
|
| 651 |
bool_t cdtext_was_available = FALSE; |
665 |
bool_t cdtext_was_available = FALSE; |
| 652 |
for (trackno = firsttrackno; trackno <= lasttrackno; trackno++) |
666 |
for (trackno = firsttrackno; trackno <= lasttrackno; trackno++) |
| 653 |
{ |
667 |
{ |
| 654 |
cdtext_t *pcdtext = NULL; |
668 |
#if LIBCDIO_VERSION_NUM < 90 |
| 655 |
if (aud_get_bool ("CDDA", "use_cdtext")) |
669 |
if (aud_get_bool ("CDDA", "use_cdtext")) |
| 656 |
{ |
670 |
{ |
| 657 |
AUDDBG ("getting cd-text information for track %d\n", trackno); |
671 |
AUDDBG ("getting cd-text information for track %d\n", trackno); |
