claunia/libcdio-osx
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git.sv.gnu.org:/srv/git/libcdio

Browse Source
This commit is contained in:
R. Bernstein
2012-04-10 03:30:27 -04:00
parent 844578d204 662c41ef60
commit 77ace7d338
6 changed files with 112 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/driver/cdtext.c
View File

@@ -342,24 +342,21 @@ cdtext_lang_t
return false.
@param p_cdtext the CD-TEXT object
@param language string representation of the language
@param language language identifier
@return true on success, false if language is not available
*/
bool
cdtext_select_language(cdtext_t *p_cdtext, const char *language)
cdtext_select_language(cdtext_t *p_cdtext, cdtext_lang_t language)
{
cdtext_lang_t lang_id;
lang_id = cdtext_is_language(language);
if(NULL == p_cdtext)
return false;
if (CDTEXT_LANGUAGE_UNKNOWN != lang_id)
if (CDTEXT_LANGUAGE_UNKNOWN != language)
{
int i;
for (i=0; i<CDTEXT_NUM_BLOCKS_MAX; i++) {
if (lang_id == p_cdtext->block[i].language_code) {
if (language == p_cdtext->block[i].language_code) {
p_cdtext->block_i = i;
return true;
}

5
lib/driver/image/cdrdao.c
View File

@@ -937,9 +937,6 @@ parse_tocfile (_img_private_t *cd, const char *psz_cue_name)
} else if (0 == strcmp ("LANGUAGE_MAP", psz_keyword)) {
/* LANGUAGE d { ... } */
} else if (0 == strcmp ("LANGUAGE", psz_keyword)) {
if (NULL == (psz_field = strtok (NULL, " \t\n\r"))) {
goto format_error;
}
/* Language number */
if (NULL == (psz_field = strtok (NULL, " \t\n\r"))) {
goto format_error;
@@ -960,7 +957,7 @@ parse_tocfile (_img_private_t *cd, const char *psz_cue_name)
cd->gen.cdtext->block[cd->gen.cdtext->block_i].language_code = CDTEXT_LANGUAGE_ENGLISH;
}
cdtext_set (cd->gen.cdtext, cdtext_key, (uint8_t*) strtok (NULL, "\"\t\n\r"),
(-1 == i ? 0 : cd->gen.i_first_track + i + 1),
(-1 == i ? 0 : cd->gen.i_first_track + i),
"ISO-8859-1");
}