Changeset 4273

Timestamp:

Dec 22, 2007, 3:01:14 AM (14 years ago)

Author:

charles

Message:

(gtk) tweak the display speed/size units again.

Location:

trunk

Files:

• gtk/util.c (modified) (1 diff)
• libtransmission/stats.c (modified) (3 diffs)

trunk/gtk/util.c

@@ -62 +62 @@
         };
         unsigned int i;
-        guint64 small = size;
-        for( i=0; i<G_N_ELEMENTS(units) && small>=1024; ++i )
-            small >>= 10;
+        double small = size;
+        for( i=0; i<G_N_ELEMENTS(units) && (small>=1024.0); ++i )
+            small /= 1024.0;
         if( i < 2 ) /* B & KiB */
             g_snprintf( buf, buflen, "%d %s", (int)small, _(units[i]) );
         else
-            g_snprintf( buf, buflen, "%.1f %s", (double)small, _(units[i]) );
+            g_snprintf( buf, buflen, "%.1f %s", small, _(units[i]) );
     }
     return buf;

trunk/libtransmission/stats.c

@@ -133 +133 @@
 }
 
+static void
+updateRatio( tr_session_stats * setme )
+{
+    if( setme->downloadedBytes )
+        setme->ratio = setme->uploadedBytes / (double)setme->downloadedBytes;
+    else if( setme->uploadedBytes )
+        setme->ratio = TR_RATIO_INF;
+    else
+        setme->ratio = TR_RATIO_NA;
+}
+
 void
 tr_getSessionStats( const tr_handle   * handle,
@@ -139 +150 @@
     const struct tr_stats_handle * stats = handle->sessionStats;
     *setme = stats->single;
-    
-    setme->ratio = setme->downloadedBytes ? (double)setme->uploadedBytes / (double)setme->downloadedBytes
-                                            : ( setme->uploadedBytes ? TR_RATIO_INF : TR_RATIO_NA );
-    
     setme->secondsActive += ( time(NULL) - stats->startTime );
+    updateRatio( setme );
 }
 
@@ -152 +160 @@
     const struct tr_stats_handle * stats = handle->sessionStats;
     *setme = stats->cumulative;
-    setme->ratio = setme->downloadedBytes ? (double)setme->uploadedBytes / (double)setme->downloadedBytes : TR_RATIO_NA;
     setme->secondsActive += ( time(NULL) - stats->startTime );
+    updateRatio( setme );
 }