diff --git a/libisoburn/trunk/xorriso/write_run.c b/libisoburn/trunk/xorriso/write_run.c index 36fdc059..b742e4db 100644 --- a/libisoburn/trunk/xorriso/write_run.c +++ b/libisoburn/trunk/xorriso/write_run.c @@ -146,7 +146,7 @@ no_track:; #ifdef Xorriso_with_libjtE if(xorriso->libjte_handle != NULL) - padding= 0; /* JTE : no multi-session, no_emul_toc, and no padding */ + padding= 0; /* JTE : no multi-session, no_emul_toc, padding in libisofs */ #endif /* ! Xorriso_with_libjtE */ burn_track_define_data(tracks[0], 0, padding * 2048, 0, BURN_MODE1); @@ -753,6 +753,9 @@ int Xorriso_write_session(struct XorrisO *xorriso, int flag) /* >>> Check whether the mandatory parameters are set */; isoburn_igopt_attach_jte(sopts, xorriso->libjte_handle); + + /* Padding to be done by libisofs, not by libburn */ + isoburn_igopt_set_tail_blocks(sopts, (uint32_t) (xorriso->padding / 2048)); } #endif /* Xorriso_with_libjtE */ diff --git a/libisoburn/trunk/xorriso/xorriso.info b/libisoburn/trunk/xorriso/xorriso.info index d1391125..a95a6af0 100644 --- a/libisoburn/trunk/xorriso/xorriso.info +++ b/libisoburn/trunk/xorriso/xorriso.info @@ -1,5 +1,5 @@ -This is xorriso.info, produced by makeinfo version 4.8 from -./xorriso.texi. +This is xorriso/xorriso.info, produced by makeinfo version 4.8 from +./xorriso/xorriso.texi. INFO-DIR-SECTION Archiving START-INFO-DIR-ENTRY @@ -2168,8 +2168,8 @@ text line: MD5 as 32 hex digits, 2 blanks, size as 12 decimal digits or blanks, 2 blanks, absolute path in the disk filesystem as given to xorriso. If the list of jigdo parameters is not empty, then xorriso will refuse -to write to non-blank targets, it will disable multi-session emulation -and padding. +to write to non-blank targets, it will disable multi-session emulation, +and eventual padding will be counted as part of the ISO image. -jigdo parameter_name value Clear Jigdo Template Extraction parameter list or add a parameter @@ -4248,58 +4248,58 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top  Tag Table: -Node: Top420 -Node: Overview1324 -Node: Model3209 -Node: Media6089 -Node: Methods8739 -Node: Drives11295 -Node: Extras14601 -Node: Processing18028 -Node: Dialog21524 -Node: Options23181 -Node: AqDrive24799 -Node: Loading27705 -Node: Insert39884 -Node: SetInsert48241 -Node: Manip56808 -Node: CmdFind65489 -Node: Filter75440 -Node: Writing79789 -Node: SetWrite86078 -Node: Bootable98029 -Node: Jigdo107119 -Node: Charset110410 -Node: Exception113161 -Node: DialogCtl117676 -Node: Inquiry120021 -Node: Navigate124151 -Node: Verify131749 -Node: Restore140169 -Node: Emulation146825 -Node: Scripting154825 -Node: Frontend160387 -Node: Examples161588 -Node: ExDevices162757 -Node: ExCreate163391 -Node: ExDialog164665 -Node: ExGrowing165927 -Node: ExModifying166729 -Node: ExBootable167230 -Node: ExCharset167777 -Node: ExPseudo168605 -Node: ExCdrecord169499 -Node: ExMkisofs169814 -Node: ExGrowisofs170817 -Node: ExException171941 -Node: ExTime172395 -Node: ExIncBackup172854 -Node: ExRestore176326 -Node: ExRecovery177295 -Node: Files177861 -Node: Seealso179089 -Node: Legal179613 -Node: CommandIdx180535 -Node: ConceptIdx194479 +Node: Top436 +Node: Overview1340 +Node: Model3225 +Node: Media6105 +Node: Methods8755 +Node: Drives11311 +Node: Extras14617 +Node: Processing18044 +Node: Dialog21540 +Node: Options23197 +Node: AqDrive24815 +Node: Loading27721 +Node: Insert39900 +Node: SetInsert48257 +Node: Manip56824 +Node: CmdFind65505 +Node: Filter75456 +Node: Writing79805 +Node: SetWrite86094 +Node: Bootable98045 +Node: Jigdo107135 +Node: Charset110477 +Node: Exception113228 +Node: DialogCtl117743 +Node: Inquiry120088 +Node: Navigate124218 +Node: Verify131816 +Node: Restore140236 +Node: Emulation146892 +Node: Scripting154892 +Node: Frontend160454 +Node: Examples161655 +Node: ExDevices162824 +Node: ExCreate163458 +Node: ExDialog164732 +Node: ExGrowing165994 +Node: ExModifying166796 +Node: ExBootable167297 +Node: ExCharset167844 +Node: ExPseudo168672 +Node: ExCdrecord169566 +Node: ExMkisofs169881 +Node: ExGrowisofs170884 +Node: ExException172008 +Node: ExTime172462 +Node: ExIncBackup172921 +Node: ExRestore176393 +Node: ExRecovery177362 +Node: Files177928 +Node: Seealso179156 +Node: Legal179680 +Node: CommandIdx180602 +Node: ConceptIdx194546  End Tag Table diff --git a/libisoburn/trunk/xorriso/xorriso.texi b/libisoburn/trunk/xorriso/xorriso.texi index ad0af9aa..1d80f7f9 100644 --- a/libisoburn/trunk/xorriso/xorriso.texi +++ b/libisoburn/trunk/xorriso/xorriso.texi @@ -2907,8 +2907,8 @@ MD5 as 32 hex digits, 2 blanks, size as 12 decimal digits or blanks, 2 blanks, absolute path in the disk filesystem as given to xorriso. @* If the list of jigdo parameters is not empty, then xorriso will refuse to -write to non-blank targets, it will disable multi-session emulation and -padding. +write to non-blank targets, it will disable multi-session emulation, and +eventual padding will be counted as part of the ISO image. @* @table @asis @sp 1 diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h index e3801c77..9a982074 100644 --- a/libisoburn/trunk/xorriso/xorriso_timestamp.h +++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2010.10.02.210023" +#define Xorriso_timestamP "2010.10.02.210305"