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

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

Browse Source 
Conflicts:
	lib/driver/image/bincue.c
This commit is contained in:
R. Bernstein
2012-03-10 16:13:58 -05:00
parent 8023341b0b 0c7c1104fd
commit 892ff0522e
32 changed files with 1672 additions and 1210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/cd-info.c
View File

@@ -423,8 +423,8 @@ print_cdtext_track_info(cdtext_t *p_cdtext, track_t i_track, const char *psz_msg
printf("%s\n", psz_msg);
for (i=0; i < MAX_CDTEXT_FIELDS; i++) {
if (cdtext_get_const(i, i_track, p_cdtext)) {
printf("\t%s: %s\n", cdtext_field2str(i), cdtext_get_const(i, i_track, p_cdtext));
if (cdtext_get_const(p_cdtext, i, i_track)) {
printf("\t%s: %s\n", cdtext_field2str(i), cdtext_get_const(p_cdtext, i, i_track));
}
}
}
@@ -434,18 +434,28 @@ static void
print_cdtext_info(CdIo_t *p_cdio, track_t i_tracks, track_t i_first_track) {
track_t i_last_track = i_first_track+i_tracks;
cdtext_t *p_cdtext = cdio_get_cdtext(p_cdio);
cdtext_lang_t *languages;
int i, j;
if(NULL == p_cdtext) {
printf("No CD-TEXT on Disc.\n");
return;
}
print_cdtext_track_info(p_cdtext, 0, "\nCD-TEXT for Disc:");
for ( ; i_first_track < i_last_track; i_first_track++ ) {
char msg[50];
sprintf(msg, "CD-TEXT for Track %2d:", i_first_track);
print_cdtext_track_info(p_cdtext, i_first_track, msg);
}
languages = cdtext_languages_available(p_cdtext);
for(i=0; i<8; i++)
if ( CDTEXT_LANGUAGE_UNKNOWN != languages[i]
&& cdtext_select_language(p_cdtext, cdtext_lang2str(languages[i])))
{
printf("\nLanguage %d '%s':\n", i, cdtext_lang2str(languages[i]));
print_cdtext_track_info(p_cdtext, 0, "CD-TEXT for Disc:");
for ( j = i_first_track ; j < i_last_track; j++ ) {
char msg[50];
sprintf(msg, "CD-TEXT for Track %2d:", j);
print_cdtext_track_info(p_cdtext, j, msg);
}
}
}
#ifdef HAVE_CDDB

18
src/cdda-player.c
View File

@@ -544,9 +544,9 @@ get_cddb_disc_info(CdIo_t *p_cdio)
}
#define add_cdtext_disc_info(format_str, info_field, FIELD) \
if (cdtext_get_const(FIELD, 0, p_cdtext) && !strlen(info_field)) { \
if (cdtext_get_const(p_cdtext, FIELD, 0) && !strlen(info_field)) { \
snprintf(info_field, sizeof(info_field), format_str, \
cdtext_get_const(FIELD, 0, p_cdtext)); \
cdtext_get_const(p_cdtext, FIELD, 0)); \
b_cdtext_ ## info_field = true; \
}
@@ -556,9 +556,9 @@ get_cdtext_disc_info(CdIo_t *p_cdio)
cdtext_t *p_cdtext = cdio_get_cdtext(p_cdio);
if (p_cdtext) {
add_cdtext_disc_info("%s", title, CDTEXT_TITLE);
add_cdtext_disc_info("%s", artist, CDTEXT_PERFORMER);
add_cdtext_disc_info("%s", genre, CDTEXT_GENRE);
add_cdtext_disc_info("%s", title, CDTEXT_FIELD_TITLE);
add_cdtext_disc_info("%s", artist, CDTEXT_FIELD_PERFORMER);
add_cdtext_disc_info("%s", genre, CDTEXT_FIELD_GENRE);
}
}
@@ -840,10 +840,10 @@ get_cddb_track_info(track_t i_track)
}
#define add_cdtext_track_info(format_str, info_field, FIELD) \
if (cdtext_get_const(FIELD, i_track, p_cdtext)) { \
if (cdtext_get_const(p_cdtext, FIELD, i_track)) { \
snprintf(cd_info[i_track].info_field, \
sizeof(cd_info[i_track].info_field), \
format_str, cdtext_get_const(FIELD, i_track, p_cdtext)); \
format_str, cdtext_get_const(p_cdtext, FIELD, i_track)); \
cd_info[i_track].b_cdtext = true; \
}
@@ -855,8 +855,8 @@ get_cdtext_track_info(track_t i_track)
cdtext_t *p_cdtext = cdio_get_cdtext(p_cdio);
if (NULL != p_cdtext) {
add_cdtext_track_info("%s", title, CDTEXT_TITLE);
add_cdtext_track_info("%s", artist, CDTEXT_PERFORMER);
add_cdtext_track_info("%s", title, CDTEXT_FIELD_TITLE);
add_cdtext_track_info("%s", artist, CDTEXT_FIELD_PERFORMER);
}
}