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

Made libisoburn and xorriso require libburn >= 0.4.4

Browse Source
This commit is contained in:
Thomas Schmitt 2008-04-08 15:35:17 +00:00
parent 70e8f2712e
commit ad29faa0d1
3 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libisoburn/trunk/libisoburn/libisoburn.h
View File

@ -196,7 +196,7 @@ void isoburn_version(int *major, int *minor, int *micro);
*/ */
#define isoburn_libburn_req_major 0 #define isoburn_libburn_req_major 0
#define isoburn_libburn_req_minor 4 #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 /** The minimum version of libisofs to be used with this version of libisoburn

2
libisoburn/trunk/xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2008.04.07.201253" #define Xorriso_timestamP "2008.04.08.153508"

19
libisoburn/trunk/xorriso/xorrisoburn.c
View File

@ -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 */ /* >>> todo: throw out the copies of libdax_msgs entrails */
/* <<< to be replaced by libburn-0.4.3 API call burn_sev_to_text(). /* <<< 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_ABORT 0x71000000
#define LIBDAX_MSGS_SEV_NEVER 0x7fffffff #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 Xorriso__sev_to_text(int severity, char **severity_name,
int flag) int flag)
@ -278,11 +287,16 @@ int Xorriso__sev_to_text(int severity, char **severity_name,
ret= iso_sev_to_text(severity, severity_name); ret= iso_sev_to_text(severity, severity_name);
if(ret>0) if(ret>0)
return(ret); return(ret);
#ifdef Xorriso_on_libburn_after_0_4_2 #ifdef Xorriso_on_libburn_after_0_4_2
ret= burn_sev_to_text(severity, severity_name, 0); ret= burn_sev_to_text(severity, severity_name, 0);
if(ret>0) if(ret>0)
return(ret); return(ret);
#endif *severity_name= "";
return(0);
#else /* Xorriso_on_libburn_after_0_4_2 */
if(flag&1) { if(flag&1) {
*severity_name= "NEVER\nABORT\nFATAL\nFAILURE\nSORRY\nWARNING\nHINT\nNOTE\nUPDATE\nDEBUG\nALL"; *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(0);
} }
return(1); return(1);
#endif /* ! Xorriso_on_libburn_after_0_4_2 */
} }