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

Delegated write_type selection to caller of libisoburn

Browse Source
This commit is contained in:
Thomas Schmitt 2012-07-08 13:42:01 +00:00
parent 56b1a92cc2
commit 5a9c2e0380
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libisoburn/burn_wrap.c
View File

@ -157,7 +157,7 @@ LIBBURN_MISCONFIGURATION_ = 0;
#ifdef Xorriso_with_libjtE #ifdef Xorriso_with_libjtE
/* The minimum requirement of libisoburn towards the libjte header /* The minimum requirement of libisoburn towards the libjte header
at compile time is the same as the one of a usable libisfs itowards libjte. at compile time is the same as the one of a usable libisofs towards libjte.
So the requirement is defined in libisofs/libisofs.h : So the requirement is defined in libisofs/libisofs.h :
iso_libjte_req_major , iso_libjte_req_minor , iso_libjte_req_micro iso_libjte_req_major , iso_libjte_req_minor , iso_libjte_req_micro
*/ */
@ -917,6 +917,10 @@ void isoburn_disc_write(struct burn_write_opts *opts, struct burn_disc *disc)
} }
} }
#ifdef Libisoburn_write_type_autO
/* <<< on its way out */
write_type= burn_write_opts_auto_write_type(opts, disc, reasons, 0); write_type= burn_write_opts_auto_write_type(opts, disc, reasons, 0);
if (write_type == BURN_WRITE_NONE) { if (write_type == BURN_WRITE_NONE) {
sprintf(msg, "Failed to find a suitable write mode:\n%s", reasons); sprintf(msg, "Failed to find a suitable write mode:\n%s", reasons);
@ -928,6 +932,23 @@ void isoburn_disc_write(struct burn_write_opts *opts, struct burn_disc *disc)
goto ex; goto ex;
} }
#else /* Libisoburn_write_type_autO */
/* The caller is in charge to select the write type */
ret = burn_precheck_write(opts, disc, reasons, 0);
if(ret <= 0) {
sprintf(msg, "Write parameters not properly set for this medium:\n %s",
reasons);
isoburn_msgs_submit(o, 0x00060000, msg, 0, "FAILURE", 0);
if(o!=NULL)
o->wrote_well= 0;
/* To cause a negative reply with burn_drive_wrote_well() */
burn_drive_cancel(drive);
goto ex;
}
#endif /* ! Libisoburn_write_type_autO */
sprintf(reasons, "%d", (int) write_type); sprintf(reasons, "%d", (int) write_type);
sprintf(msg, "Write_type = %s\n", sprintf(msg, "Write_type = %s\n",
(write_type == BURN_WRITE_SAO ? "SAO" : (write_type == BURN_WRITE_SAO ? "SAO" :

2
xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2012.06.27.192151" #define Xorriso_timestamP "2012.07.08.134305"