From f27c70c4503a2c484b96ac71a6ed04a61337d5ff Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Fri, 5 Mar 2010 11:15:28 +0000
Subject: [PATCH] Removed some debugging printing

---
 libburn/trunk/cdrskin/cdrskin_timestamp.h |  2 +-
 libburn/trunk/libburn/drive.c             | 65 ++---------------------
 libburn/trunk/libburn/drive.h             |  7 ---
 libburn/trunk/libburn/init.c              | 12 +----
 4 files changed, 6 insertions(+), 80 deletions(-)

diff --git a/libburn/trunk/cdrskin/cdrskin_timestamp.h b/libburn/trunk/cdrskin/cdrskin_timestamp.h
index 79619d8b..353d557d 100644
--- a/libburn/trunk/cdrskin/cdrskin_timestamp.h
+++ b/libburn/trunk/cdrskin/cdrskin_timestamp.h
@@ -1 +1 @@
-#define Cdrskin_timestamP "2010.03.05.091432"
+#define Cdrskin_timestamP "2010.03.05.111712"
diff --git a/libburn/trunk/libburn/drive.c b/libburn/trunk/libburn/drive.c
index f274e3e2..2788abf5 100644
--- a/libburn/trunk/libburn/drive.c
+++ b/libburn/trunk/libburn/drive.c
@@ -1904,7 +1904,10 @@ int burn_abort_5(int patience,
 #endif
 
 
-fprintf(stderr, "libburn_EXPERIMENTAL: burn_abort_5(%d,%d)\n", patience, flag);
+/*
+ fprintf(stderr, 
+ "libburn_EXPERIMENTAL: burn_abort_5(%d,%d)\n", patience, flag);
+*/
 
 	current_time = start_time = pacifier_time = time(0);
 	start_time -= elapsed;
@@ -1987,66 +1990,6 @@ fprintf(stderr, "libburn_EXPERIMENTAL: burn_abort_5(%d,%d)\n", patience, flag);
 }
 
 
-#ifdef NIX
-
-/* <<< did not help. Is on its way out */
-/* ts B00226 */
-/* Wait for the most delicate drive states to end
-*/
-int burn_abort_write(int patience, 
-               int (*pacifier_func)(void *handle, int patience, int elapsed),
-               void *handle)
-{
-	int ret, i, still_not_done= 1, pacifier_off= 0;
-	unsigned long wait_grain= 100000;
-	time_t start_time, current_time, pacifier_time, end_time;
-	struct burn_drive *d;
-
-fprintf(stderr, "libburn_EXPERIMENTAL: burn_abort_write\n");
-
-	current_time = start_time = pacifier_time = time(0);
-	end_time = start_time + patience;
-
-	while(current_time < end_time || patience <= 0) {
-		still_not_done = 0;
-
-		for(i = 0; i < drivetop + 1; i++) {
-			d = &(drive_array[i]);
-			if(d->global_index < 0)
-		continue;
-			if(d->busy != BURN_DRIVE_WRITING &&
-			   d->busy != BURN_DRIVE_WRITING_LEADIN &&
-			   d->busy != BURN_DRIVE_WRITING_LEADOUT &&
-			   d->busy != BURN_DRIVE_WRITING_PREGAP &&
-			   d->busy != BURN_DRIVE_CLOSING_TRACK &&
-			   d->busy != BURN_DRIVE_CLOSING_SESSION)
-		continue;
-			still_not_done = 1;
-		}
-
-		if(still_not_done == 0 || patience <= 0)
-	break;
-		usleep(wait_grain);
-		current_time = time(0);
-		if(current_time>pacifier_time) {
-			if(pacifier_func != NULL && !pacifier_off) {
-				ret = (*pacifier_func)(handle, patience,
-						current_time - start_time);
-				pacifier_off = (ret <= 0);
-			}
-			pacifier_time = current_time;
-		}
-	}
-	if (current_time - start_time > patience - 3)
-		patience = current_time - start_time + 3;
-	ret = burn_abort_5(patience, pacifier_func, handle,
-				current_time - start_time, 0);
-	return ret; 
-}
-
-#endif /* NIX */
-
-
 /** Abort any running drive operation and finish libburn.
     @param patience Maximum number of seconds to wait for drives to finish
     @param pacifier_func Function to produce appeasing messages. See
diff --git a/libburn/trunk/libburn/drive.h b/libburn/trunk/libburn/drive.h
index e043e5ca..b59de715 100644
--- a/libburn/trunk/libburn/drive.h
+++ b/libburn/trunk/libburn/drive.h
@@ -141,13 +141,6 @@ char *burn_drive_whitelist_item(int idx, int flag);
 /* ts A80801 */
 int burn_drive_is_listed(char *path, struct burn_drive **found, int flag);
 
-#ifdef NIX
-/* <<< did not help. Is on its way out */
-/* ts B00226 */
-int burn_abort_write(int patience,
-               int (*pacifier_func)(void *handle, int patience, int elapsed),
-               void *handle);
-#endif /* NIX */
 
 /* ts B00226 : Outsourced backend of burn_abort()
    @param elapsed  to be subtracted from start time
diff --git a/libburn/trunk/libburn/init.c b/libburn/trunk/libburn/init.c
index 9f5ca2d9..a99acb49 100644
--- a/libburn/trunk/libburn/init.c
+++ b/libburn/trunk/libburn/init.c
@@ -353,8 +353,8 @@ int burn_builtin_abort_handler(void *handle, int signum, int flag)
 
 #define Libburn_new_thread_signal_handleR 1
 /*
-*/
 #define Libburn_signal_handler_verbouS 1
+*/
 
 	int ret;
 	struct burn_drive *d;
@@ -503,10 +503,6 @@ void burn_set_signal_handling(void *handle, burn_abort_handler_t handler,
 		burn_builtin_triggered_action = 0;
 	if(burn_builtin_signal_action == 0)
 		burn_builtin_signal_action = 1;
-
-fprintf(stderr, "libburn_EXPERIMENTAL: mode = %d , burn_builtin_signal_action = %d\n",
-mode, burn_builtin_signal_action);
-
 	Cleanup_set_handlers(handle, (Cleanup_app_handler_T) handler,
 				 (mode & 15) | 4);
 	burn_global_signal_handle = handle;
@@ -531,13 +527,7 @@ int burn_init_catch_on_abort(int flag)
 	if (abort_control_pid != getpid() ||
 		abort_control_thread != pthread_self())
 		return 1;
-
-#ifdef NIX
-	burn_abort_write(4440, burn_abort_pacifier, abort_message_prefix);
-#else
 	burn_abort(4440, burn_abort_pacifier, abort_message_prefix);
-#endif
-
 	fprintf(stderr,
 	"\n%sABORT : Program done. Even if you do not see a shell prompt.\n\n",
 		abort_message_prefix);