Changeset 3075

Timestamp:

02/17/10 08:12:23 (7 months ago)

Author:

scdbackup

Message:

Avoided random percentage display at start of blanking

Location:

libburn/trunk

Files:

• cdrskin/cdrskin_timestamp.h (modified) (1 diff)
• libburn/async.c (modified) (5 diffs)
• libburn/drive.c (modified) (4 diffs)
• libburn/write.c (modified) (2 diffs)

libburn/trunk/cdrskin/cdrskin_timestamp.h

@@ -1 @@
-#define Cdrskin_timestamP "2010.02.16.194147"
+#define Cdrskin_timestamP "2010.02.17.141409"

libburn/trunk/libburn/async.c

@@ -233 +233 @@
 }
 
+static void reset_progress(struct burn_drive *d, int sessions, int tracks,
+                                int indices, int sectors, int flag)
+{
+        /* reset the progress indicator */
+        d->progress.session = 0;
+        d->progress.sessions = sessions;
+        d->progress.track = 0;
+        d->progress.tracks = tracks;
+        d->progress.index = 0;
+        d->progress.indices = indices;
+        d->progress.start_sector = 0;
+        d->progress.sectors = sectors;
+        d->progress.sector = 0;
+}
+
+
 int burn_drive_scan(struct burn_drive_info *drives[], unsigned int *n_drives)
 {
@@ -315 +331 @@
         /* a ssert(!SCAN_GOING()); */
         /* a ssert(!find_worker(drive)); */
+
         if((drive == NULL)) {
                 libdax_msgs_submit(libdax_messenger, drive->global_index,
@@ -330 +347 @@
                 return;
         }
+
+        reset_progress(drive, 1, 1, 1, 0x10000, 0);
+
         /* A70103 : will be set to 0 by burn_disc_erase_sync() */
         drive->cancel = 1;
@@ -383 +403 @@
         int ok = 0, ret;
         char msg[160];
+
+        reset_progress(drive, 1, 1, 1, 0x10000, 0);
 
         if ((SCAN_GOING()) || find_worker(drive) != NULL) {
@@ -548 +570 @@
         }
 
+        reset_progress(d, disc->sessions, disc->session[0]->tracks,
+                         disc->session[0]->track[0]->indices, 0, 0);
+
         /* For the next lines any return indicates failure */
         d->cancel = 1;

libburn/trunk/libburn/drive.c

@@ -622 +622 @@
 
         d->cancel = 0;
-        d->busy = BURN_DRIVE_ERASING;
-        d->erase(d, fast);
+
+#ifdef Libburn_reset_progress_asynC
+        /* <<< This is now done in async.c */
         /* reset the progress */
         d->progress.session = 0;
@@ -634 +635 @@
         d->progress.sectors = 0x10000;
         d->progress.sector = 0;
+#endif /* Libburn_reset_progress_asynC */
+
+        d->erase(d, fast);
+        d->busy = BURN_DRIVE_ERASING;
+
         /* read the initial 0 stage */
         while (!d->test_unit_ready(d) && d->get_erase_progress(d) == 0)
@@ -660 +666 @@
         struct buffer buf, *buf_mem = d->buffer;
 
+#ifdef Libburn_reset_progress_asynC
+        /* <<< This is now done in async.c */
         /* reset the progress */
         d->progress.session = 0;
@@ -670 +678 @@
         d->progress.sectors = 0x10000;
         d->progress.sector = 0;
+#endif /* Libburn_reset_progress_asynC */
+
         stages = 1 + ((flag & 1) && size > 1024 * 1024);
         d->cancel = 0;

libburn/trunk/libburn/write.c

@@ -943 +943 @@
         d->cancel = 0;
 
+#ifdef Libburn_reset_progress_asynC
+        /* <<< This is now done in async.c */
         /* init progress before showing the state */
         d->progress.session = 0;
@@ -957 +959 @@
         d->progress.sector = 0;
         d->progress.track = 0;
+#endif /* Libburn_reset_progress_asynC */
 
         /* ts A61023 */