Removed MULTI construction site remarks

This commit is contained in:
2008-07-17 18:44:41 +00:00
parent a745366913
commit a68624cc5c
4 changed files with 12 additions and 90 deletions

View File

@ -6040,34 +6040,17 @@ int Xorriso_burn_track(struct XorrisO *xorriso, off_t write_start_address,
burn_session_add_track(session, track, BURN_POS_END);
burn_source_free(data_src);
/* MULTI :
if grow_overwriteable_iso:
consider overwriteables with ISO as appendable
*/
if(flag&1)
disc_state = isoburn_disc_get_status(drive);
/* consider overwriteables with ISO as appendable */
disc_state= isoburn_disc_get_status(drive);
else
disc_state = burn_disc_get_status(drive);
if(disc_state == BURN_DISC_BLANK) {
/* ok */;
} else if(disc_state == BURN_DISC_APPENDABLE) {
/* MULTI : allow appendable media */
/* ok */;
/*
if(!isoburn_needs_emulation(drive)) {
sprintf(xorriso->info_text,
"Appendable media with data detected. Need blank media.");
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
ret= 0; goto ex;
}
*/
/* handle overwriteables as always blank */
disc_state= burn_disc_get_status(drive);
if(disc_state == BURN_DISC_BLANK || disc_state == BURN_DISC_APPENDABLE) {
/* ok */;
} else {
if(disc_state == BURN_DISC_FULL) {
/* MULTI */
sprintf(xorriso->info_text,
"Closed media with data detected. Need blank or appendable media.");
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
@ -6088,14 +6071,10 @@ int Xorriso_burn_track(struct XorrisO *xorriso, off_t write_start_address,
if(isoburn_needs_emulation(drive))
burn_write_opts_set_multi(burn_options, 0);
/* MULTI : tsize */
if(tsize > 0) {
fixed_size= tsize;
burn_track_set_size(track, fixed_size);
}
/* MULTI : if -isosize :
*/
if(do_isosize) {
ret= burn_fifo_peek_data(xorriso->pacifier_fifo, head_buffer, 64*1024, 0);
if(ret<=0) {
@ -6105,7 +6084,6 @@ int Xorriso_burn_track(struct XorrisO *xorriso, off_t write_start_address,
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
ret= 0; goto ex;
}
/* read isosize from head_buffer, not from media*/
ret= isoburn_read_iso_head(drive, 0, &isosize, head_buffer, (1<<13));
if(ret<=0) {
@ -6124,9 +6102,6 @@ int Xorriso_burn_track(struct XorrisO *xorriso, off_t write_start_address,
ret= Xorriso_get_profile(xorriso, &profile_number, profile_name, 2);
is_cd= (ret==2);
/* MULTI :
consider overwriteables as blank if not grow_overwriteable_iso */
if(isoburn_needs_emulation(drive)) {
if(flag&1) {
ret= isoburn_disc_track_lba_nwa(drive, burn_options, 0, &dummy, &nwa);
@ -6146,7 +6121,6 @@ int Xorriso_burn_track(struct XorrisO *xorriso, off_t write_start_address,
}
}
/* MULTI : */
if(write_start_address>=0) {
nwa= write_start_address / (off_t) 2048;
if(((off_t) nwa) * (off_t) 2048 < write_start_address )
@ -6182,8 +6156,7 @@ int Xorriso_burn_track(struct XorrisO *xorriso, off_t write_start_address,
ret= 0; goto ex;
}
/* MULTI : */
/* update ISO header at lba 0 */
/* Update ISO header at lba 0 */
if((flag&1) && nwa >= 32) {
if(!do_isosize) {
/* head_buffer was not filled yet. Read it from output media. */
@ -6523,7 +6496,6 @@ int Xorriso_libburn_adr(struct XorrisO *xorriso, char *path, char adr[],
}
/* MULTI : */
/* @param flag bit0= grow_overwriteable_iso
bit1= obtain info from outdev
*/
@ -6538,10 +6510,7 @@ int Xorriso_msinfo(struct XorrisO *xorriso, int *msc1, int *msc2, int flag)
"on attempt to obtain msinfo", flag&2);
if(ret<=0)
return(ret);
/* MULTI:
if grow_overwriteable_iso :
inquire by isoburn_disc_get_status()
*/;
if(flag&1)
disc_state= isoburn_disc_get_status(drive);
else