From 8ade912d76e687008e1a23831384b0ccdecf767d Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Wed, 1 Feb 2012 16:29:26 +0000 Subject: [PATCH] Reporting correct speed unit with -check_media use=outdev --- xorriso/drive_mgt.c | 3 ++- xorriso/text_io.c | 4 +++- xorriso/xorriso_timestamp.h | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/xorriso/drive_mgt.c b/xorriso/drive_mgt.c index a10253ac..b48a1761 100644 --- a/xorriso/drive_mgt.c +++ b/xorriso/drive_mgt.c @@ -2424,7 +2424,8 @@ failed_to_write:; if(post_read_time - xorriso->last_update_time >= xorriso->pacifier_interval) Xorriso_pacifier_callback(xorriso, "blocks read", - xorriso->pacifier_count, xorriso->pacifier_total, "", 8 | 16); + xorriso->pacifier_count, xorriso->pacifier_total, "", + 8 | 16 | (128 * (job->use_dev == 1))); } } if(prev_quality >= 0) { diff --git a/xorriso/text_io.c b/xorriso/text_io.c index c1ff9a7b..1b0ccf37 100644 --- a/xorriso/text_io.c +++ b/xorriso/text_io.c @@ -2011,6 +2011,7 @@ int Xorriso_pacifier_reset(struct XorrisO *xorriso, int flag) bit4= with bit3: count is in blocks, else in bytes bit5= with bit3: report total speed bit6= report with carriage return rather than line feed + bit7= with bit5: speed unit for outdev rather than indev */ int Xorriso_pacifier_callback(struct XorrisO *xorriso, char *what_done, off_t count, off_t todo, char *current_object, @@ -2067,7 +2068,8 @@ int Xorriso_pacifier_callback(struct XorrisO *xorriso, char *what_done, if(speed >= 0.0) { if(flag & 16) speed*= 2048.0; - ret= Xorriso_get_profile(xorriso, &profile_number, profile_name, 0); + ret= Xorriso_get_profile(xorriso, &profile_number, profile_name, + (flag >> 6) & 2); speed_factor= 1385000; speed_unit= "D"; if(ret == 2) { diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h index 655e12c0..8bbd86a4 100644 --- a/xorriso/xorriso_timestamp.h +++ b/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2012.02.01.122709" +#define Xorriso_timestamP "2012.02.01.162935"