From 2cb7afe397ecff81497c93b34ed2c5ad97f35d08 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Thu, 22 Jan 2009 14:33:09 +0000 Subject: [PATCH] Making use of new libisoburn macro isoburn_igopt_aaip --- libisoburn/trunk/xorriso/xorriso_timestamp.h | 2 +- libisoburn/trunk/xorriso/xorrisoburn.c | 11 ++--------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h index 295a3688..9b06aaeb 100644 --- a/libisoburn/trunk/xorriso/xorriso_timestamp.h +++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2009.01.22.143210" +#define Xorriso_timestamP "2009.01.22.143253" diff --git a/libisoburn/trunk/xorriso/xorrisoburn.c b/libisoburn/trunk/xorriso/xorrisoburn.c index 82698294..e196ca95 100644 --- a/libisoburn/trunk/xorriso/xorrisoburn.c +++ b/libisoburn/trunk/xorriso/xorrisoburn.c @@ -1310,16 +1310,9 @@ int Xorriso_write_session(struct XorrisO *xorriso, int flag) } } isoburn_igopt_set_level(sopts, 3); - isoburn_igopt_set_extensions(sopts, 1|((!!xorriso->do_joliet)<<1)); - -#ifdef NIX - isoburn_igopt_set_relaxed(sopts, isoburn_igopt_allow_deep_paths | - (xorriso->do_always_gmt * isoburn_igopt_always_gmt) | - isoburn_igopt_rrip_version_1_10); -#else + isoburn_igopt_set_extensions(sopts, 1 | ((!!xorriso->do_joliet)<<1) | + ((!!(xorriso->do_aaip & (2 | 8))) << 5)); isoburn_igopt_set_relaxed(sopts, relax); -#endif - isoburn_igopt_set_sort_files(sopts, 1); isoburn_igopt_set_over_mode(sopts, 0, 0, (mode_t) 0, (mode_t) 0); isoburn_igopt_set_over_ugid(sopts, 0, 0, (uid_t) 0, (gid_t) 0);