Changeset 3104

Timestamp:

03/05/10 05:15:28 (6 months ago)

Author:

scdbackup

Message:

Removed some debugging printing

Location:

libburn/trunk

Files:

• cdrskin/cdrskin_timestamp.h (modified) (1 diff)
• libburn/drive.c (modified) (2 diffs)
• libburn/drive.h (modified) (1 diff)
• libburn/init.c (modified) (3 diffs)

libburn/trunk/cdrskin/cdrskin_timestamp.h

@@ -1 @@
-#define Cdrskin_timestamP "2010.03.05.091432"
+#define Cdrskin_timestamP "2010.03.05.111712"

libburn/trunk/libburn/drive.c

@@ -1905 +1905 @@
 
 
-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);
@@ -1986 +1989 @@
         return(still_not_done == 0); 
 }
-
-
-#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 */
 
 

libburn/trunk/libburn/drive.h

@@ -142 +142 @@
 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()

libburn/trunk/libburn/init.c

@@ -354 +354 @@
 #define Libburn_new_thread_signal_handleR 1
 /*
-*/
 #define Libburn_signal_handler_verbouS 1
+*/
 
         int ret;
@@ -504 +504 @@
         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);
@@ -532 +528 @@
                 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",