Continued work with -toc

This commit is contained in:
Thomas Schmitt 2007-10-17 20:02:45 +00:00
parent 356248bd3e
commit da510cfd0e
2 changed files with 18 additions and 9 deletions

View File

@ -1 +1 @@
#define Xorriso_timestamP "2007.10.17.183024"
#define Xorriso_timestamP "2007.10.17.200241"

View File

@ -156,7 +156,7 @@ int Xorriso_aquire_drive(struct XorrisO *xorriso, char *adr, int flag)
if(isoburn_read_volset(drive, &ropts, &volset) <= 0) {
Xorriso_process_msg_queues(xorriso,0);
sprintf(xorriso->info_text,"Caninot read ISO image volset");
sprintf(xorriso->info_text,"Cannot read ISO image volset");
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0);
ret= 0; goto ex;
}
@ -502,7 +502,7 @@ int Xorriso_process_msg_queues(struct XorrisO *xorriso, int flag)
int Xorriso_toc(struct XorrisO *xorriso, int flag)
{
int num_sessions= 0 , num_tracks= 0 , lba= 0, nwa, pmin, psec, pframe, ret;
int num_sessions= 0, num_tracks= 0, lba= 0, nwa= 0, pmin, psec, pframe, ret;
int track_count= 0, session_no, track_no, profile_no= -1;
int last_track_start= 0, last_track_size= -1;
char profile_name[80],*respt;
@ -526,6 +526,12 @@ int Xorriso_toc(struct XorrisO *xorriso, int flag)
respt= xorriso->result_line;
sprintf(respt, "Drive current: -indev '%s'\n", xorriso->indev);
Xorriso_result(xorriso,0);
sprintf(respt, "Drive type : vendor '%s' product '%s' revision '%s'\n",
dinfo[0].vendor, dinfo[0].product, dinfo[0].revision);
Xorriso_result(xorriso,0);
sprintf(respt, "Media current: ");
ret= burn_disc_get_profile(drive, &profile_no, profile_name);
if (profile_no > 0 && ret > 0) {
@ -602,17 +608,20 @@ int Xorriso_toc(struct XorrisO *xorriso, int flag)
lba= burn_msf_to_lba(toc_entry.pmin, toc_entry.psec, toc_entry.pframe);
}
sprintf(respt, "Media content: session %2d ", session_no+1);
Xorriso_result(xorriso,0);
sprintf(respt, "leadout lba: %9d\n", lba);
sprintf(respt+strlen(respt), "leadout lba: %9d\n", lba);
Xorriso_result(xorriso,0);
last_track_size= lba - last_track_start;
if (s == BURN_DISC_APPENDABLE) {
ret= isoburn_disc_track_lba_nwa(drive, NULL, 0, &lba, &nwa);
if(ret<=0)
nwa= 0;
}
}
}
if (s == BURN_DISC_APPENDABLE) {
/* >>> tell nwa */;
if (s == BURN_DISC_APPENDABLE && nwa>0) {
sprintf(respt, "Media nwa : %ds\n", nwa);
Xorriso_result(xorriso,0);
}
if (disc!=NULL)