libburnia/libisoburn
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rectified usage of original xorriso options underneath growisofs

Browse Source
This commit is contained in:
Thomas Schmitt
2008-07-17 11:13:32 +00:00
parent 58ba5aeff6
commit 31809252e8
5 changed files with 50 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
xorriso/xorrisoburn.c
View File

@ -487,7 +487,8 @@ int Xorriso_aquire_drive(struct XorrisO *xorriso, char *adr, int flag)
xorriso->image_start_mode&= ~0xffff; /* perform auto setting */
if((xorriso->image_start_mode&(1<<30))) { /* if enabled at all */
ret= isoburn_set_msc1(drive, xorriso->image_start_mode & 0xffff,
xorriso->image_start_value, 0);
xorriso->image_start_value,
!!(xorriso->image_start_mode & (1<<16)));
if(ret<=0)
goto ex;
if(xorriso->image_start_mode&(1<<31))
@ -1096,8 +1097,8 @@ int Xorriso_check_burn_abort(struct XorrisO *xorriso, int flag)
It issues pacifying update messages to the user.
@param flag bit0-3 = emulation mode
0= xorriso
1= cdrecord
2= mkisofs
1= mkisofs
2= cdrecord
bit4= report speed in CD units
*/
int Xorriso_pacifier_loop(struct XorrisO *xorriso, struct burn_drive *drive,
@ -1130,7 +1131,7 @@ int Xorriso_pacifier_loop(struct XorrisO *xorriso, struct burn_drive *drive,
break;
current_time= Sfile_microtime(0);
if(drive_status == BURN_DRIVE_WRITING && progress.sectors > 0) {
if(emul==1) {
if(emul==2) {
if(progress.sector<=progress.sectors)
sprintf(xorriso->info_text, "%4d of %4d MB written",
progress.sector / 512, progress.sectors / 512);
@ -1163,7 +1164,7 @@ int Xorriso_pacifier_loop(struct XorrisO *xorriso, struct burn_drive *drive,
measured_speed/speed_factor);
}
} else if(emul == 2 &&
} else if(emul == 1 &&
progress.sectors > 0 && progress.sector <= progress.sectors) {
/* "37.87% done, estimate finish Tue Jul 15 18:55:07 2008" */
@ -6170,7 +6171,7 @@ int Xorriso_burn_track(struct XorrisO *xorriso, off_t write_start_address,
xorriso->run_state= 1; /* Indicate that burning has started */
burn_disc_write(burn_options, disc);
ret= Xorriso_pacifier_loop(xorriso, drive, 1|(is_cd<<4));
ret= Xorriso_pacifier_loop(xorriso, drive, 2|(is_cd<<4));
if(ret<=0)
goto ex;
if(!burn_drive_wrote_well(drive)) {