1) cdtext objects are no longer associated with a track but with the disc.
2) - cdio_get_cdtext no longer takes track as an argument - cdtext_get, cdtext_get_const, cdtext_set require track argument 3) Language, Genre, Genre Code and Encoding Fields are now properly parsed and stored in the cdtext object 4) Added public function cdio_get_cdtext_raw to extract the binary CD-Text 5) Added CDTEXTFILE keyword logic in cue sheet parser. Parses binary/raw CD-Text files 6) Added cdtext_genre2str to convert genre code 7) altered the example programs, test drivers, cdda-player and cd-info to work with these changes 8) Added test case 9) A few smaller changes A disc either holds CD-Text for all the tracks or does not hold any. Therefore a CD-Text object for the whole disc seems more natural to me. It also enables us to store global fields, like genre, encoding, language. Patch was tested on GNU/Linux 32 bit running Gentoo.
This commit is contained in:
@@ -75,10 +75,10 @@ main(int argc, const char *argv[])
|
||||
}
|
||||
{
|
||||
unsigned int i;
|
||||
cdtext_t *p_cdtext = cdio_get_cdtext(p_cdio, 0);
|
||||
cdtext_t *p_cdtext = cdio_get_cdtext(p_cdio);
|
||||
if (!p_cdtext) return(1);
|
||||
for (i=0; i<NUM_FIELDS; i++) {
|
||||
const char *psz_field = p_cdtext->field[cdtext_fields[i]];
|
||||
const char *psz_field = cdtext_get_const(cdtext_fields[i], 0, p_cdtext);
|
||||
if (!psz_field)
|
||||
return(2);
|
||||
if (0 != strncmp(psz_field, cdtext_check[i], strlen(cdtext_check[i]))) {
|
||||
|
||||
Reference in New Issue
Block a user