From dafcb1e56a88f423e7363b7212e7229ed7bec7e1 Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Wed, 7 Oct 2009 12:39:45 +0000
Subject: [PATCH] Aligned sessions on overwriteables to full 32 blocks

---
 xorriso/xorriso.c           |  2 +-
 xorriso/xorriso_timestamp.h |  2 +-
 xorriso/xorrisoburn.c       | 10 ++++++++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/xorriso/xorriso.c b/xorriso/xorriso.c
index 07a9f6d5..c2b85b6f 100644
--- a/xorriso/xorriso.c
+++ b/xorriso/xorriso.c
@@ -15829,7 +15829,7 @@ int Xorriso_option_help(struct XorrisO *xorriso, int flag)
 "  -load \"session\"|\"track\"|\"lba\"|\"sbsector\"|\"volid\"|\"auto\" id",
 "                 Load a particular (outdated) ISO image from a -dev or",
 "                 -indev which hosts more than one session.",
-"  -rom_toc_scan \"on\"|\"off\"[:\"emul_on\"|\"emul_off\"]",
+"  -rom_toc_scan \"on\"|\"force\"|\"off\"[:\"emul_on\"|\"emul_off\"]",
 "                 Enable scanning for ISO sessions on read-only drives/media",
 "                 resp. on overwriteable media with emulated TOC.",
 "  -calm_drive \"in\"|\"out\"|\"all\"|\"on\"|\"off\"",
diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h
index 00b8f7a2..a7477a1d 100644
--- a/xorriso/xorriso_timestamp.h
+++ b/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2009.10.07.080042"
+#define Xorriso_timestamP "2009.10.07.124047"
diff --git a/xorriso/xorrisoburn.c b/xorriso/xorrisoburn.c
index f9de10eb..eb54fb17 100644
--- a/xorriso/xorrisoburn.c
+++ b/xorriso/xorrisoburn.c
@@ -1485,6 +1485,16 @@ no_track:;
      Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "NOTE", 0);
    }
  }
+ if(xorriso->alignment == 0) {
+   ret= isoburn_needs_emulation(drive);
+   if(ret > 0) {
+     /* Take care that the session is padded up to the future NWA.
+        Else with padding < 32 it could happen that PVDs from older
+        sessions survive and confuse -rom_toc_scan.
+      */
+     xorriso->alignment= 32;
+   }
+ }
  if(xorriso->alignment > 0) {
    if(img_sectors > 0) {
      ret= isoburn_disc_track_lba_nwa(drive, burn_options, 0, &lba, &nwa);