dvd-sector-copy.c (update_progress): Squish time delta calculation.

[dvdrip] / dvd-sector-copy.c

diff --git a/dvd-sector-copy.c b/dvd-sector-copy.c
index 27ec397..b1ca133 100644 (file)
--- a/dvd-sector-copy.c
+++ b/dvd-sector-copy.c
@@ -335,8 +335,7 @@ static void update_progress(secaddr pos)
   struct timeval now;
   double t, f, g;
 
-  gettimeofday(&now, 0);
-  t = tvdiff(&last_time, &now);
+  gettimeofday(&now, 0); t = tvdiff(&last_time, &now);
 
 #define BETA (1 - alpha)
 
@@ -1115,19 +1114,19 @@ int main(int argc, char *argv[])
 #ifdef DEBUG
   dump_eventq("initial");
 #endif
-  for (i = 0, f &= ~f_write, start = 0; i < eventq.n; i++) {
+  for (i = 0, f &= ~f_write, start = last = 0; i < eventq.n; i++) {
     ev = &eventq.v[i];
     if (ev->ev == EV_WRITE) { start = ev->pos; f |= f_write; }
     if (ev->pos >= limit) break;
     if (ev->ev == EV_STOP) { nsectors += ev->pos - start; f &= ~f_write; }
-    if (f&f_fixup) start = ev->pos;
+    if (f&f_fixup) last = ev->pos;
   }
   eventq.n = i;
 #ifdef DEBUG
   dump_eventq("trimmed");
 #endif
   if (f&f_fixup) {
-    put_event(EV_WRITE, 0, start);
+    put_event(EV_WRITE, 0, last);
     f |= f_write;
   }
   if (f&f_write) {
@@ -1178,11 +1177,11 @@ int main(int argc, char *argv[])
                      "failed to seek to resume position "
                      "(sector %"PRIuSEC") in output file `%s'",
                      ev->pos, outfile);
+       f |= f_write;
 #ifdef DEBUG
        progress_clear(&progress);
        printf(";; %8"PRIuSEC": begin write\n", pos);
 #endif
-       f |= f_write;
        break;
       case EV_STOP:
        f &= ~f_write;
@@ -1224,11 +1223,11 @@ int main(int argc, char *argv[])
   carefully_fclose(errfp, "bad-sector error log");
   progress_free(&progress);
 
+  return (0);
+
 #undef f_bogus
 #undef f_continue
 #undef f_fixup
 #undef f_stats
 #undef f_write
-
-  return (0);
 }