"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/cd-info.c" between
libcdio-2.0.0.tar.bz2 and libcdio-2.1.0.tar.bz2

About: GNU libcdio is a library for CD-ROM and CD image access.

cd-info.c  (libcdio-2.0.0.tar.bz2):cd-info.c  (libcdio-2.1.0.tar.bz2)
skipping to change at line 453 skipping to change at line 453
cdtext_lang_t *languages; cdtext_lang_t *languages;
cdtext_genre_t genre; cdtext_genre_t genre;
int i, j; int i, j;
if(NULL == p_cdtext) { if(NULL == p_cdtext) {
printf("No CD-TEXT on Disc.\n"); printf("No CD-TEXT on Disc.\n");
return; return;
} }
languages = cdtext_list_languages(p_cdtext); languages = cdtext_list_languages_v2(p_cdtext);
/* The API promises that non-NULL p_cdtext yields non-NULL languages */
for(i=0; i<8; i++) for(i=0; i<8; i++)
if ( CDTEXT_LANGUAGE_UNKNOWN != languages[i] if ( CDTEXT_LANGUAGE_BLOCK_UNUSED != languages[i]
&& cdtext_select_language(p_cdtext, languages[i])) && cdtext_set_language_index(p_cdtext, i))
{ {
printf("\nLanguage %d '%s':\n", i, 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:"); print_cdtext_track_info(p_cdtext, 0, "CD-TEXT for Disc:");
genre = cdtext_get_genre(p_cdtext); genre = cdtext_get_genre(p_cdtext);
if ( CDTEXT_GENRE_UNUSED != genre) if ( CDTEXT_GENRE_UNUSED != genre)
printf("\tGENRE_CODE: %d (%s)\n", genre, cdtext_genre2str(genre)); printf("\tGENRE_CODE: %d (%s)\n", genre, cdtext_genre2str(genre));
for ( j = i_first_track ; j < i_last_track; j++ ) { for ( j = i_first_track ; j < i_last_track; j++ ) {
char msg[50]; char msg[50];
skipping to change at line 970 skipping to change at line 971
} }
i_tracks = cdio_get_num_tracks(p_cdio); i_tracks = cdio_get_num_tracks(p_cdio);
if (CDIO_INVALID_TRACK == i_tracks) { if (CDIO_INVALID_TRACK == i_tracks) {
err_exit("Can't get number of tracks. I give up.%s\n", ""); err_exit("Can't get number of tracks. I give up.%s\n", "");
} }
if (!opts.no_tracks) { if (!opts.no_tracks) {
printf("CD-ROM Track List (%i - %i)\n" NORMAL, printf("CD-ROM Track List (%i - %i)\n" NORMAL,
i_first_track, i_tracks); i_first_track, i_first_track + i_tracks - 1);
printf(" #: MSF LSN Type Green? Copy?"); printf(" #: MSF LSN Type Green? Copy?");
if ( CDIO_DISC_MODE_CD_DA == discmode if ( CDIO_DISC_MODE_CD_DA == discmode
|| CDIO_DISC_MODE_CD_MIXED == discmode ) || CDIO_DISC_MODE_CD_MIXED == discmode )
printf(" Channels Premphasis?"); printf(" Channels Premphasis?");
printf("\n"); printf("\n");
} }
start_track_lsn = cdio_get_track_lsn(p_cdio, i_first_track); start_track_lsn = cdio_get_track_lsn(p_cdio, i_first_track);
skipping to change at line 1106 skipping to change at line 1107
} }
free(psz_msf); free(psz_msf);
if (TRACK_FORMAT_AUDIO == track_format) { if (TRACK_FORMAT_AUDIO == track_format) {
num_audio++; num_audio++;
if (-1 == first_audio) first_audio = i; if (-1 == first_audio) first_audio = i;
} else { } else {
num_data++; num_data++;
if (-1 == first_data) first_data = i; if (-1 == first_data) first_data = i;
} }
/* skip to leadout? */ /* skip to leadout */
if (i == i_tracks) i = CDIO_CDROM_LEADOUT_TRACK-1; if (i == i_first_track + i_tracks - 1) {
i = CDIO_CDROM_LEADOUT_TRACK-1;
}
} }
if (cdio_is_discmode_cdrom(discmode)) { if (cdio_is_discmode_cdrom(discmode)) {
/* get and print MCN */ /* get and print MCN */
report(stdout, "Media Catalog Number (MCN): "); fflush(stdout); report(stdout, "Media Catalog Number (MCN): "); fflush(stdout);
media_catalog_number = cdio_get_mcn(p_cdio); media_catalog_number = cdio_get_mcn(p_cdio);
if (NULL == media_catalog_number) { if (NULL == media_catalog_number) {
 End of changes. 4 change blocks. 
6 lines changed or deleted 9 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)