From ddd9fc92e43136c8fe40a789dbb535dbcd856d95 Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Thu, 7 Feb 2008 07:43:34 +0000
Subject: [PATCH] Added final message to image read pacifier

---
 libisoburn/trunk/xorriso/xorriso.c           | 7 +++++--
 libisoburn/trunk/xorriso/xorriso_private.h   | 2 +-
 libisoburn/trunk/xorriso/xorriso_timestamp.h | 2 +-
 libisoburn/trunk/xorriso/xorrisoburn.c       | 2 ++
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/libisoburn/trunk/xorriso/xorriso.c b/libisoburn/trunk/xorriso/xorriso.c
index f841b780..2f4c33b1 100644
--- a/libisoburn/trunk/xorriso/xorriso.c
+++ b/libisoburn/trunk/xorriso/xorriso.c
@@ -3209,7 +3209,7 @@ int Xorriso_pacifier_reset(struct XorrisO *xorriso, int flag)
                 Is ignored if <=0.
    @param current_object A string telling the object currently processed.
                          Ignored if "".
-   @param flag  Bitfield. Unused yet. Submit 0.
+   @param flag  bit0= report unconditionally, no time check
 */
 int Xorriso_pacifier_callback(struct XorrisO *xorriso, char *what_done,
                               off_t count, off_t todo, char *current_object,
@@ -3218,10 +3218,13 @@ int Xorriso_pacifier_callback(struct XorrisO *xorriso, char *what_done,
  double current_time, since;
  
  current_time= Sfile_microtime(0);
- if(current_time - xorriso->last_update_time < xorriso->pacifier_interval)
+ if(current_time - xorriso->last_update_time < xorriso->pacifier_interval
+    && !(flag&1))
    return(1);
  xorriso->last_update_time= Sfile_microtime(0);
  since= current_time - xorriso->start_time;
+ if((flag&1)&&since<1.0)
+   since= 1.0;
  if(count<=0.0) {
    if(current_object[0]==0)
      sprintf(xorriso->info_text,
diff --git a/libisoburn/trunk/xorriso/xorriso_private.h b/libisoburn/trunk/xorriso/xorriso_private.h
index 0c8b4663..ea94aba8 100644
--- a/libisoburn/trunk/xorriso/xorriso_private.h
+++ b/libisoburn/trunk/xorriso/xorriso_private.h
@@ -292,7 +292,7 @@ int Xorriso_pacifier_reset(struct XorrisO *xorriso, int flag);
                 Is ignored if <=0.
    @param current_object A string telling the object currently processed.
                          Ignored if "".
-   @param flag  Bitfield. Unused yet. Submit 0.
+   @param flag  bit0= report unconditionally, no time check
 */
 int Xorriso_pacifier_callback(struct XorrisO *xorriso, char *what_done,
                               off_t count, off_t todo, char *current_object,
diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h
index 62524d10..cf741265 100644
--- a/libisoburn/trunk/xorriso/xorriso_timestamp.h
+++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2008.02.06.214426"
+#define Xorriso_timestamP "2008.02.07.074248"
diff --git a/libisoburn/trunk/xorriso/xorrisoburn.c b/libisoburn/trunk/xorriso/xorrisoburn.c
index 8eaa0879..b29573c0 100644
--- a/libisoburn/trunk/xorriso/xorrisoburn.c
+++ b/libisoburn/trunk/xorriso/xorrisoburn.c
@@ -554,6 +554,8 @@ int Xorriso_aquire_drive(struct XorrisO *xorriso, char *adr, int flag)
    Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
    ret= 3; goto ex;
  }
+ Xorriso_pacifier_callback(xorriso, "nodes read", xorriso->pacifier_count, 0,
+                           "", 1); /* report end count */
  xorriso->in_volset_handle= (void *) volset;
  Xorriso_set_image_severities(xorriso, 0);
  Xorriso_update_volid(xorriso, 0);