diff --git a/libisoburn/libisoburn.h b/libisoburn/libisoburn.h index 17ac7f63..d41fbc18 100644 --- a/libisoburn/libisoburn.h +++ b/libisoburn/libisoburn.h @@ -196,7 +196,7 @@ void isoburn_version(int *major, int *minor, int *micro); */ #define isoburn_libburn_req_major 0 #define isoburn_libburn_req_minor 4 -#define isoburn_libburn_req_micro 2 +#define isoburn_libburn_req_micro 4 /** The minimum version of libisofs to be used with this version of libisoburn diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h index 3660f5e4..7701029e 100644 --- a/xorriso/xorriso_timestamp.h +++ b/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2008.04.07.201253" +#define Xorriso_timestamP "2008.04.08.153508" diff --git a/xorriso/xorrisoburn.c b/xorriso/xorrisoburn.c index c192225d..3e955bfe 100644 --- a/xorriso/xorrisoburn.c +++ b/xorriso/xorrisoburn.c @@ -247,6 +247,13 @@ int Xorriso_get_drive_handles(struct XorrisO *xorriso, } +/* ts A80408 : Moved to libburn-0.4.4 +*/ +#define Xorriso_on_libburn_after_0_4_2 yes + + +#ifndef Xorriso_on_libburn_after_0_4_2 + /* >>> todo: throw out the copies of libdax_msgs entrails */ /* <<< to be replaced by libburn-0.4.3 API call burn_sev_to_text(). @@ -269,6 +276,8 @@ int Xorriso_get_drive_handles(struct XorrisO *xorriso, #define LIBDAX_MSGS_SEV_ABORT 0x71000000 #define LIBDAX_MSGS_SEV_NEVER 0x7fffffff +#endif /* ! Xorriso_on_libburn_after_0_4_2 */ + int Xorriso__sev_to_text(int severity, char **severity_name, int flag) @@ -278,11 +287,16 @@ int Xorriso__sev_to_text(int severity, char **severity_name, ret= iso_sev_to_text(severity, severity_name); if(ret>0) return(ret); + #ifdef Xorriso_on_libburn_after_0_4_2 + ret= burn_sev_to_text(severity, severity_name, 0); if(ret>0) return(ret); -#endif + *severity_name= ""; + return(0); + +#else /* Xorriso_on_libburn_after_0_4_2 */ if(flag&1) { *severity_name= "NEVER\nABORT\nFATAL\nFAILURE\nSORRY\nWARNING\nHINT\nNOTE\nUPDATE\nDEBUG\nALL"; @@ -320,6 +334,9 @@ int Xorriso__sev_to_text(int severity, char **severity_name, return(0); } return(1); + +#endif /* ! Xorriso_on_libburn_after_0_4_2 */ + }