From ed6e2df81bbdfb4827948eedd8a05ffcf565f918 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Sun, 7 Mar 2010 08:15:21 +0000 Subject: [PATCH] Changed examples burn_set_signal_handling(...,48) to (...,0x30) --- cdrskin/cdrskin_timestamp.h | 2 +- libburn/libburn.h | 9 +-------- test/libburner.c | 6 +++--- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/cdrskin/cdrskin_timestamp.h b/cdrskin/cdrskin_timestamp.h index dbf9533..68d1db7 100644 --- a/cdrskin/cdrskin_timestamp.h +++ b/cdrskin/cdrskin_timestamp.h @@ -1 +1 @@ -#define Cdrskin_timestamP "2010.03.05.190110" +#define Cdrskin_timestamP "2010.03.07.081704" diff --git a/libburn/libburn.h b/libburn/libburn.h index ea22ad1..7615804 100644 --- a/libburn/libburn.h +++ b/libburn/libburn.h @@ -2809,7 +2809,7 @@ typedef int (*burn_abort_handler_t)(void *handle, int signum, int flag); But FreeBSD 8.0 sometimes pauses the other threads until the signal handler returns. The new actions try to avoid this deadlock. It is advised to use action 3 - burn_set_signal_handling(text, NULL, 48); + burn_set_signal_handling(text, NULL, 0x30); and call burn_is_aborting(0) frequently. If it replies 1, then call burn_abort() and exit(1). @param handle Opaque handle eventually pointing to an application @@ -3008,11 +3008,4 @@ BURN_END_DECLS #define Libburn_dummy_probe_write_modeS 1 -/* ts B00225 */ -/* Leave abort handler quickly and catch control thread in - burn_drive_get_status(). -*/ -#define Libburn_signal_handler_return_2 1 - - #endif /*LIBBURN_H*/ diff --git a/test/libburner.c b/test/libburner.c index aa0d288..6f78af9 100644 --- a/test/libburner.c +++ b/test/libburner.c @@ -317,7 +317,7 @@ int libburner_blank_disc(struct burn_drive *drive, int blank_fast) return 0; } /* Switch to asynchronous signal handling for the time of waiting */ - burn_set_signal_handling("libburner : ", NULL, 48); + burn_set_signal_handling("libburner : ", NULL, 0x30); printf("Beginning to %s-blank media.\n", (blank_fast?"fast":"full")); burn_disc_erase(drive, blank_fast); @@ -386,7 +386,7 @@ int libburner_format(struct burn_drive *drive) fprintf(stderr, "FATAL: Can only format DVD-RW or BD\n"); return 0; } - burn_set_signal_handling("libburner : ", NULL, 48); + burn_set_signal_handling("libburner : ", NULL, 0x30); printf("Beginning to format media.\n"); burn_disc_format(drive, size, format_flag); @@ -547,7 +547,7 @@ int libburner_payload(struct burn_drive *drive, fprintf(stderr, "Reasons given:\n%s\n", reasons); return 0; } - burn_set_signal_handling("libburner : ", NULL, 48); + burn_set_signal_handling("libburner : ", NULL, 0x30); printf("Burning starts. With e.g. 4x media expect up to a minute of zero progress.\n"); start_time = time(0);