Improved media summary with overwritable media and unknown content

This commit is contained in:
Thomas Schmitt 2011-07-24 19:34:52 +00:00
parent 9110f895d2
commit 8a67604efc
2 changed files with 18 additions and 7 deletions

View File

@ -941,8 +941,8 @@ int Xorriso_toc(struct XorrisO *xorriso, int flag)
Xorriso_process_msg_queues(xorriso,0); Xorriso_process_msg_queues(xorriso,0);
if(drive_role == 5 && s == BURN_DISC_APPENDABLE) { if(drive_role == 5 && s == BURN_DISC_APPENDABLE) {
ret= burn_disc_track_lba_nwa(drive, NULL, 0, &lba, &nwa); ret= burn_disc_track_lba_nwa(drive, NULL, 0, &lba, &nwa);
if(ret == 1) if(ret != 1)
num_data= nwa; lba= 0;
} else { } else {
ret= isoburn_get_min_start_byte(drive, &start_byte, 0); ret= isoburn_get_min_start_byte(drive, &start_byte, 0);
nwa= start_byte / 2048; nwa= start_byte / 2048;
@ -968,13 +968,19 @@ int Xorriso_toc(struct XorrisO *xorriso, int flag)
1, 0, image_blocks, volume_id); 1, 0, image_blocks, volume_id);
nwa= image_blocks; nwa= image_blocks;
} else { } else {
nwa= num_data;
ret= burn_disc_get_formats(drive, &status, &size, &dummy, ret= burn_disc_get_formats(drive, &status, &size, &dummy,
&num_formats); &num_formats);
if(ret>0 && status==BURN_FORMAT_IS_FORMATTED) if(ret <= 0 || status != BURN_FORMAT_IS_FORMATTED)
nwa= size/2048; size= 0;
if(size <= 0) {
ret= burn_get_read_capacity(drive, &num_data, 0);
if(ret == 1)
size= ((off_t) num_data) * (off_t) 2048;
}
nwa= lba + size / 2048;
num_data= nwa - lba;
sprintf(respt, "%13s: %3d , %9d , %9ds , \n", sprintf(respt, "%13s: %3d , %9d , %9ds , \n",
typetext, 1, num_data, nwa); typetext, 1, lba, num_data);
} }
if(!(flag&1)) if(!(flag&1))
Xorriso_toc_line(xorriso, flag & 8); Xorriso_toc_line(xorriso, flag & 8);
@ -1369,6 +1375,11 @@ int Xorriso_list_speeds(struct XorrisO *xorriso, int flag)
} }
for (item= speed_list; item != NULL; item= item->next) { for (item= speed_list; item != NULL; item= item->next) {
sprintf(xorriso->info_text, "speed= %5dk , source= %d",
item->write_speed, item->source);
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "DEBUG", 0);
if(item->profile_loaded >= 0x08 && item->profile_loaded <= 0x0a) if(item->profile_loaded >= 0x08 && item->profile_loaded <= 0x0a)
is_cd= item->profile_loaded; is_cd= item->profile_loaded;
if(item->profile_loaded > 0) if(item->profile_loaded > 0)

View File

@ -1 +1 @@
#define Xorriso_timestamP "2011.07.15.083052" #define Xorriso_timestamP "2011.07.24.193433"