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:
@@ -650,8 +650,6 @@ init_os2 (void *p_user_data)
|
||||
|
||||
p_env->gen.init = true;
|
||||
p_env->gen.toc_init = false;
|
||||
p_env->gen.b_cdtext_init = false;
|
||||
p_env->gen.b_cdtext_error = false;
|
||||
p_env->gen.fd = p_env->h_cd;
|
||||
|
||||
return true;
|
||||
@@ -1447,6 +1445,7 @@ cdio_open_os2 (const char *psz_orig_source)
|
||||
_funcs.get_blocksize = get_blocksize_os2;
|
||||
#endif
|
||||
_funcs.get_cdtext = get_cdtext_generic;
|
||||
_funcs.get_cdtext_raw = read_cdtext_generic;
|
||||
_funcs.get_default_device = cdio_get_default_device_os2;
|
||||
_funcs.get_devices = cdio_get_devices_os2;
|
||||
_funcs.get_disc_last_lsn = get_disc_last_lsn_os2;
|
||||
@@ -1487,6 +1486,7 @@ cdio_open_os2 (const char *psz_orig_source)
|
||||
|
||||
_data = calloc(1, sizeof (_img_private_t));
|
||||
_data->access_mode = _AM_OS2;
|
||||
_data->gen.b_cdtext_error = false;
|
||||
_data->gen.init = false;
|
||||
_data->gen.fd = -1;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user