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

Renamed isoburn_*set_msgs_submit() and slightly changed meaning

Browse Source
This commit is contained in:
Thomas Schmitt 2008-06-19 09:04:04 +00:00
parent 4061ada9c0
commit 24109d9f39
4 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libisoburn/trunk/libisoburn/burn_wrap.c
View File

@ -227,9 +227,9 @@ int isoburn_libburn_req(int *major, int *minor, int *micro)
} }
int isoburn_preset_msgs_submit(int (*msgs_submit)(void *handle, int error_code, int isoburn_set_msgs_submit(int (*msgs_submit)(void *handle, int error_code,
char msg_text[], int os_errno, char msg_text[], int os_errno,
char severity[], int flag), char severity[], int flag),
void *submit_handle, int submit_flag, int flag) void *submit_handle, int submit_flag, int flag)
{ {
libisoburn_default_msgs_submit= msgs_submit; libisoburn_default_msgs_submit= msgs_submit;
@ -1379,7 +1379,7 @@ int isoburn_get_track_lba(struct isoburn_toc_track *track, int *lba, int flag)
} }
int isoburn_set_msgs_submit(struct burn_drive *d, int isoburn_drive_set_msgs_submit(struct burn_drive *d,
int (*msgs_submit)(void *handle, int error_code, int (*msgs_submit)(void *handle, int error_code,
char msg_text[], int os_errno, char msg_text[], int os_errno,
char severity[], int flag), char severity[], int flag),

15
libisoburn/trunk/libisoburn/libisoburn.h
View File

@ -299,10 +299,9 @@ and would leave out the ugly compile time traps.
/** Announce to the library an application provided method for immediate /** Announce to the library an application provided method for immediate
delivery of messages. It is attached by default to any newly aquired drive delivery of messages. It is used when no drive is affected directly or
and can later be changed by isoburn_set_msgs_submit(). if the drive has no own msgs_submit() method attached by
The preset method is also used when no drive is directly related to isoburn_drive_set_msgs_submit.
a message.
If no method is preset or if the method is set to NULL then libisoburn If no method is preset or if the method is set to NULL then libisoburn
delivers its messages through the message queue of libburn. delivers its messages through the message queue of libburn.
@param msgs_submit The function call which implements the method @param msgs_submit The function call which implements the method
@ -311,11 +310,12 @@ and would leave out the ugly compile time traps.
@param flag Unused yet, submit 0 @param flag Unused yet, submit 0
@since 0.2.0 @since 0.2.0
*/ */
int isoburn_preset_msgs_submit(int (*msgs_submit)(void *handle, int error_code, int isoburn_set_msgs_submit(int (*msgs_submit)(void *handle, int error_code,
char msg_text[], int os_errno, char msg_text[], int os_errno,
char severity[], int flag), char severity[], int flag),
void *submit_handle, int submit_flag, int flag); void *submit_handle, int submit_flag, int flag);
/** Aquire a target drive by its filesystem path resp. libburn persistent /** Aquire a target drive by its filesystem path resp. libburn persistent
address. address.
Wrapper for: burn_drive_scan_and_grab() Wrapper for: burn_drive_scan_and_grab()
@ -371,7 +371,8 @@ int isoburn_drive_grab(struct burn_drive *drive, int load);
/** Attach to a drive an application provided method for immediate /** Attach to a drive an application provided method for immediate
delivery of messages. delivery of messages.
If no method is set or if the method is set to NULL then libisoburn If no method is set or if the method is set to NULL then libisoburn
delivers messages of the drive through the message queue of libburn. delivers messages of the drive through the global msgs_submit() method
set by isoburn_set_msgs_submiti() or by the message queue of libburn.
@since 0.2.0 @since 0.2.0
@param d The drive to which this function, handle and flag shall apply @param d The drive to which this function, handle and flag shall apply
@param msgs_submit The function call which implements the method @param msgs_submit The function call which implements the method
@ -379,7 +380,7 @@ int isoburn_drive_grab(struct burn_drive *drive, int load);
@param submit_flag Flag to be used as last argument of msgs_submit @param submit_flag Flag to be used as last argument of msgs_submit
@param flag Unused yet, submit 0 @param flag Unused yet, submit 0
*/ */
int isoburn_set_msgs_submit(struct burn_drive *d, int isoburn_drive_set_msgs_submit(struct burn_drive *d,
int (*msgs_submit)(void *handle, int error_code, int (*msgs_submit)(void *handle, int error_code,
char msg_text[], int os_errno, char msg_text[], int os_errno,
char severity[], int flag), char severity[], int flag),

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

@ -1 +1 @@
#define Xorriso_timestamP "2008.06.18.192913" #define Xorriso_timestamP "2008.06.19.090436"

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

@ -466,8 +466,8 @@ int Xorriso_aquire_drive(struct XorrisO *xorriso, char *adr, int flag)
} }
if(dinfo==NULL) { if(dinfo==NULL) {
isoburn_preset_msgs_submit(Xorriso_msgs_submit_void, (void *) xorriso, isoburn_set_msgs_submit(Xorriso_msgs_submit_void, (void *) xorriso,
(3<<2) | 128 , 0); (3<<2) | 128 , 0);
aquire_flag= 1 | ((flag&(8|4))>>1) | ((xorriso->toc_emulation_flag&1)<<3); aquire_flag= 1 | ((flag&(8|4))>>1) | ((xorriso->toc_emulation_flag&1)<<3);
ret= isoburn_drive_aquire(&dinfo, libburn_adr, aquire_flag); ret= isoburn_drive_aquire(&dinfo, libburn_adr, aquire_flag);
Xorriso_process_msg_queues(xorriso,0); Xorriso_process_msg_queues(xorriso,0);