Changeset 10937

Timestamp:

Jul 4, 2010, 6:07:21 AM (12 years ago)

Author:

charles

Message:

(trunk) #3045 "speed units" -- change the public API of libtransmission based on feedback from livings

Location:

trunk

Files:

• cli/cli.c (modified) (4 diffs)
• daemon/remote.c (modified) (17 diffs)
• doc/rpc-spec.txt (modified) (6 diffs)
• gtk/details.c (modified) (18 diffs)
• gtk/main.c (modified) (3 diffs)
• gtk/msgwin.c (modified) (1 diff)
• gtk/torrent-cell-renderer.c (modified) (15 diffs)
• gtk/tr-core.c (modified) (5 diffs)
• gtk/tr-icon.c (modified) (2 diffs)
• gtk/tr-prefs.c (modified) (14 diffs)
• gtk/tr-window.c (modified) (8 diffs)
• gtk/tr-window.h (modified) (1 diff)
• gtk/util.c (modified) (4 diffs)
• gtk/util.h (modified) (1 diff)
• libtransmission/cache.c (modified) (1 diff)
• libtransmission/peer-mgr.c (modified) (4 diffs)
• libtransmission/peer-mgr.h (modified) (1 diff)
• libtransmission/rpcimpl.c (modified) (12 diffs)
• libtransmission/session.c (modified) (20 diffs)
• libtransmission/session.h (modified) (2 diffs)
• libtransmission/torrent.c (modified) (7 diffs)
• libtransmission/torrent.h (modified) (2 diffs)
• libtransmission/transmission.h (modified) (12 diffs)
• libtransmission/utils.c (modified) (4 diffs)
• libtransmission/utils.h (modified) (1 diff)
• qt/formatter.cc (modified) (4 diffs)
• qt/mainwin.cc (modified) (7 diffs)
• qt/prefs-dialog.cc (modified) (7 diffs)
• qt/prefs-dialog.h (modified) (1 diff)
• qt/prefs.cc (modified) (3 diffs)
• qt/session.h (modified) (1 diff)
• qt/speed.h (modified) (1 diff)
• qt/torrent.cc (modified) (3 diffs)
• qt/torrent.h (modified) (1 diff)
• utils/show.c (modified) (2 diffs)

trunk/cli/cli.c

@@ -158 +158 @@
         char ratioStr[80];
 
-        tr_formatter_speed( upStr, st->pieceUploadSpeed_Bps, sizeof( upStr ) );
-        tr_formatter_speed( dnStr, st->pieceDownloadSpeed_Bps, sizeof( dnStr ) );
+        tr_formatter_speed_KBps( upStr, st->pieceUploadSpeed_KBps, sizeof( upStr ) );
+        tr_formatter_speed_KBps( dnStr, st->pieceDownloadSpeed_KBps, sizeof( dnStr ) );
         tr_strlratio( ratioStr, st->ratio, sizeof( ratioStr ) );
 
@@ -177 +177 @@
         char ratioStr[80];
 
-        tr_formatter_speed( upStr, st->pieceUploadSpeed_Bps, sizeof( upStr ) );
+        tr_formatter_speed_KBps( upStr, st->pieceUploadSpeed_KBps, sizeof( upStr ) );
         tr_strlratio( ratioStr, st->ratio, sizeof( ratioStr ) );
 
@@ -359 +359 @@
             case 'B': tr_bencDictAddBool( d, TR_PREFS_KEY_BLOCKLIST_ENABLED, FALSE );
                       break;
-            case 'd': tr_bencDictAddInt ( d, TR_PREFS_KEY_DSPEED_Bps, atoi( optarg ) * SPEED_K );
+            case 'd': tr_bencDictAddInt ( d, TR_PREFS_KEY_DSPEED_KBps, atoi( optarg ) );
                       tr_bencDictAddBool( d, TR_PREFS_KEY_DSPEED_ENABLED, TRUE );
                       break;
@@ -377 +377 @@
             case 't': tr_bencDictAddInt( d, TR_PREFS_KEY_PEER_SOCKET_TOS, atoi( optarg ) );
                       break;
-            case 'u': tr_bencDictAddInt( d, TR_PREFS_KEY_USPEED_Bps, atoi( optarg ) * SPEED_K );
+            case 'u': tr_bencDictAddInt( d, TR_PREFS_KEY_USPEED_KBps, atoi( optarg ) );
                       tr_bencDictAddBool( d, TR_PREFS_KEY_USPEED_ENABLED, TRUE );
                       break;

trunk/daemon/remote.c

@@ -141 +141 @@
 
 static char*
-strlratio( char * buf, double numerator, double denominator, size_t buflen )
+strlratio( char * buf, int64_t numerator, int64_t denominator, size_t buflen )
 {
     double ratio;
 
-    if( denominator )
-        ratio = numerator / denominator;
-    else if( numerator )
+    if( denominator != 0 )
+        ratio = numerator / (double)denominator;
+    else if( numerator != 0 )
         ratio = TR_RATIO_INF;
     else
@@ -161 +161 @@
         tr_strlcpy( buf, "None", buflen );
     else
-        tr_formatter_mem( buf, bytes, buflen );
+        tr_formatter_mem_B( buf, bytes, buflen );
 
     return buf;
@@ -172 +172 @@
         tr_strlcpy( buf, "None", buflen );
     else
-        tr_formatter_size( buf, bytes, buflen );
-
-    return buf;
-}
-
-static char*
-strlspeed( char * buf, int64_t bytes_per_second, size_t buflen )
-{
-    if( !bytes_per_second )
-        tr_strlcpy( buf, "None", buflen );
-    else
-        tr_formatter_speed( buf, bytes_per_second, buflen );
+        tr_formatter_size_B( buf, bytes, buflen );
 
     return buf;
@@ -832 +821 @@
                 printf( "  ETA: %s\n", tr_strltime( buf, i, sizeof( buf ) ) );
             if( tr_bencDictFindInt( t, "rateDownload", &i ) )
-                printf( "  Download Speed: %s\n", strlspeed( buf, i, sizeof( buf ) ) );
+                printf( "  Download Speed: %s\n", tr_formatter_speed_KBps( buf, i, sizeof( buf ) ) );
             if( tr_bencDictFindInt( t, "rateUpload", &i ) )
-                printf( "  Upload Speed: %s\n", strlspeed( buf, i, sizeof( buf ) ) );
+                printf( "  Upload Speed: %s\n", tr_formatter_speed_KBps( buf, i, sizeof( buf ) ) );
             if( tr_bencDictFindInt( t, "haveUnchecked", &i )
               && tr_bencDictFindInt( t, "haveValid", &j ) )
@@ -1107 +1096 @@
                 printf( "  Download Limit: " );
                 if( boolVal )
-                    printf( "%s\n", strlspeed( buf, i, sizeof( buf ) ) );
+                    printf( "%s\n", tr_formatter_speed_KBps( buf, i, sizeof( buf ) ) );
                 else
                     printf( "Unlimited\n" );
@@ -1116 +1105 @@
                 printf( "  Upload Limit: " );
                 if( boolVal )
-                    printf( "%s\n", strlspeed( buf, i, sizeof( buf ) ) );
+                    printf( "%s\n", tr_formatter_speed_KBps( buf, i, sizeof( buf ) ) );
                 else
                     printf( "Unlimited\n" );
@@ -1241 +1230 @@
             printf( "%-20s  %-12s  %-5.1f %6.1f  %6.1f  %s\n",
                     address, flagstr, (progress*100.0),
-                    rateToClient / (double)SPEED_K,
-                    rateToPeer / (double)SPEED_K,
+                    (double)rateToClient,
+                    (double)rateToPeer,
                     client );
         }
@@ -1400 +1389 @@
         if( tr_bencDictFindStr( args,  TR_PREFS_KEY_ENCRYPTION, &str ) )
             printf( "  Encryption: %s\n", str );
-        if( tr_bencDictFindInt( args, TR_PREFS_KEY_MAX_CACHE_SIZE, &i ) )
-            printf( "  Maximum memory cache size: %s\n", strlsize( buf, i, sizeof( buf ) ) );
+        if( tr_bencDictFindInt( args, TR_PREFS_KEY_MAX_CACHE_SIZE_MB, &i ) )
+            printf( "  Maximum memory cache size: %s\n", tr_formatter_mem_MB( buf, i, sizeof( buf ) ) );
         printf( "\n" );
 
@@ -1409 +1398 @@
             double seedRatioLimit;
 
-            if( tr_bencDictFindInt ( args, TR_PREFS_KEY_ALT_SPEED_DOWN_Bps, &altDown ) &&
+            if( tr_bencDictFindInt ( args, TR_PREFS_KEY_ALT_SPEED_DOWN_KBps, &altDown ) &&
                 tr_bencDictFindBool( args, TR_PREFS_KEY_ALT_SPEED_ENABLED, &altEnabled ) &&
                 tr_bencDictFindInt ( args, TR_PREFS_KEY_ALT_SPEED_TIME_BEGIN, &altBegin ) &&
@@ -1415 +1404 @@
                 tr_bencDictFindInt ( args, TR_PREFS_KEY_ALT_SPEED_TIME_END, &altEnd ) &&
                 tr_bencDictFindInt ( args, TR_PREFS_KEY_ALT_SPEED_TIME_DAY, &altDay ) &&
-                tr_bencDictFindInt ( args, TR_PREFS_KEY_ALT_SPEED_UP_Bps, &altUp ) &&
+                tr_bencDictFindInt ( args, TR_PREFS_KEY_ALT_SPEED_UP_KBps, &altUp ) &&
                 tr_bencDictFindInt ( args, TR_PREFS_KEY_PEER_LIMIT_GLOBAL, &peerLimit ) &&
-                tr_bencDictFindInt ( args, TR_PREFS_KEY_DSPEED_Bps, &downLimit ) &&
+                tr_bencDictFindInt ( args, TR_PREFS_KEY_DSPEED_KBps, &downLimit ) &&
                 tr_bencDictFindBool( args, TR_PREFS_KEY_DSPEED_ENABLED, &downEnabled ) &&
-                tr_bencDictFindInt ( args, TR_PREFS_KEY_USPEED_Bps, &upLimit ) &&
+                tr_bencDictFindInt ( args, TR_PREFS_KEY_USPEED_KBps, &upLimit ) &&
                 tr_bencDictFindBool( args, TR_PREFS_KEY_USPEED_ENABLED, &upEnabled ) &&
                 tr_bencDictFindReal( args, "seedRatioLimit", &seedRatioLimit ) &&
@@ -1438 +1427 @@
 
                 if( altEnabled )
-                    strlspeed( buf, altUp, sizeof( buf ) );
+                    tr_formatter_speed_KBps( buf, altUp, sizeof( buf ) );
                 else if( upEnabled )
-                    strlspeed( buf, upLimit, sizeof( buf ) );
+                    tr_formatter_speed_KBps( buf, upLimit, sizeof( buf ) );
                 else
                     tr_strlcpy( buf, "Unlimited", sizeof( buf ) );
@@ -1446 +1435 @@
                         buf,
                         upEnabled ? "Enabled" : "Disabled",
-                        strlspeed( buf2, upLimit, sizeof( buf2 ) ),
+                        tr_formatter_speed_KBps( buf2, upLimit, sizeof( buf2 ) ),
                         altEnabled ? "Enabled" : "Disabled",
-                        strlspeed( buf3, altUp, sizeof( buf3 ) ) );
+                        tr_formatter_speed_KBps( buf3, altUp, sizeof( buf3 ) ) );
 
                 if( altEnabled )
-                    strlspeed( buf, altDown, sizeof( buf ) );
+                    tr_formatter_speed_KBps( buf, altDown, sizeof( buf ) );
                 else if( downEnabled )
-                    strlspeed( buf, downLimit, sizeof( buf ) );
+                    tr_formatter_speed_KBps( buf, downLimit, sizeof( buf ) );
                 else
                     tr_strlcpy( buf, "Unlimited", sizeof( buf ) );
@@ -1459 +1448 @@
                         buf,
                         downEnabled ? "Enabled" : "Disabled",
-                        strlspeed( buf2, downLimit, sizeof( buf2 ) ),
+                        tr_formatter_speed_KBps( buf2, downLimit, sizeof( buf2 ) ),
                         altEnabled ? "Enabled" : "Disabled",
-                        strlspeed( buf2, altDown, sizeof( buf2 ) ) );
+                        tr_formatter_speed_KBps( buf2, altDown, sizeof( buf2 ) ) );
 
                 if( altTimeEnabled ) {
@@ -1846 +1835 @@
                 case 971: tr_bencDictAddBool( args, TR_PREFS_KEY_ALT_SPEED_ENABLED, FALSE );
                           break;
-                case 972: tr_bencDictAddInt( args, TR_PREFS_KEY_ALT_SPEED_DOWN_Bps, numarg( optarg ) * SPEED_K );
-                          break;
-                case 973: tr_bencDictAddInt( args, TR_PREFS_KEY_ALT_SPEED_UP_Bps, numarg( optarg ) * SPEED_K );
+                case 972: tr_bencDictAddInt( args, TR_PREFS_KEY_ALT_SPEED_DOWN_KBps, numarg( optarg ) );
+                          break;
+                case 973: tr_bencDictAddInt( args, TR_PREFS_KEY_ALT_SPEED_UP_KBps, numarg( optarg ) );
                           break;
                 case 974: tr_bencDictAddBool( args, TR_PREFS_KEY_ALT_SPEED_TIME_ENABLED, TRUE );
@@ -1865 +1854 @@
                 case 'C': tr_bencDictAddBool( args, TR_PREFS_KEY_INCOMPLETE_DIR_ENABLED, FALSE );
                           break;
-                case 'e': tr_bencDictAddReal( args, TR_PREFS_KEY_MAX_CACHE_SIZE, atof(optarg) * MEM_K * MEM_K );
+                case 'e': tr_bencDictAddReal( args, TR_PREFS_KEY_MAX_CACHE_SIZE_MB, atof(optarg) );
                           break;
                 case 910: tr_bencDictAddStr( args, TR_PREFS_KEY_ENCRYPTION, "required" );
@@ -1923 +1912 @@
             {
                 case 'd': if( targs ) {
-                              tr_bencDictAddInt( targs, "downloadLimit", numarg( optarg ) * SPEED_K );
+                              tr_bencDictAddInt( targs, "downloadLimit", numarg( optarg ) );
                               tr_bencDictAddBool( targs, "downloadLimited", TRUE );
                           } else {
-                              tr_bencDictAddInt( sargs, TR_PREFS_KEY_DSPEED_Bps, numarg( optarg ) * SPEED_K  );
+                              tr_bencDictAddInt( sargs, TR_PREFS_KEY_DSPEED_KBps, numarg( optarg ) );
                               tr_bencDictAddBool( sargs, TR_PREFS_KEY_DSPEED_ENABLED, TRUE );
                           }
@@ -1936 +1925 @@
                           break;
                 case 'u': if( targs ) {
-                              tr_bencDictAddInt( targs, "uploadLimit", numarg( optarg ) * SPEED_K );
+                              tr_bencDictAddInt( targs, "uploadLimit", numarg( optarg ) );
                               tr_bencDictAddBool( targs, "uploadLimited", TRUE );
                           } else {
-                              tr_bencDictAddInt( sargs, TR_PREFS_KEY_USPEED_Bps, numarg( optarg ) * SPEED_K );
+                              tr_bencDictAddInt( sargs, TR_PREFS_KEY_USPEED_KBps, numarg( optarg ) );
                               tr_bencDictAddBool( sargs, TR_PREFS_KEY_USPEED_ENABLED, TRUE );
                           }

trunk/doc/rpc-spec.txt

@@ -90 +90 @@
    ----------------------+-------------------------------------------------
    "bandwidthPriority"   | number     this torrent's bandwidth tr_priority_t
-   "downloadLimit"       | number     maximum download speed (bytes per second)
+   "downloadLimit"       | number     maximum download speed (KBps)
    "downloadLimited"     | boolean    true if "downloadLimit" is honored
    "files-wanted"        | array      indices of file(s) to download
@@ -106 +106 @@
    "trackerEdit"         | object     (see below)
    "trackerRemove"       | object     (see below)
-   "uploadLimit"         | number     maximum upload speed (bytes per second)
+   "uploadLimit"         | number     maximum upload speed (KBps)
    "uploadLimited"       | boolean    true if "uploadLimit" is honored
                          |
@@ -419 +419 @@
    string                        | value type & description
    ------------------------------+-------------------------------------------------
-   "alt-speed-down"              | number     max global download speed (in bytes per second)
+   "alt-speed-down"              | number     max global download speed (KBps)
    "alt-speed-enabled"           | boolean    true means use the alt speeds
    "alt-speed-time-begin"        | number     when to turn on alt speeds (units: minutes after midnight)
@@ -425 +425 @@
    "alt-speed-time-end"          | number     when to turn off alt speeds (units: same)
    "alt-speed-time-day"          | number     what day(s) to turn on alt speeds (look at tr_sched_day)
-   "alt-speed-up"                | number     max global upload speed (in bytes per second)
+   "alt-speed-up"                | number     max global upload speed (KBps)
    "blocklist-enabled"           | boolean    true means enabled
    "blocklist-size"              | number     number of rules in the blocklist
-   "cache-size"                  | number     maximum size (in bytes) of the disk cache
+   "cache-size"                  | number     maximum size of the disk cache (MB)
    "config-dir"                  | string     location of transmission's configuration directory
    "download-dir"                | string     default path to download torrents
@@ -449 +449 @@
    "seedRatioLimit"              | double     the default seed ratio for torrents to use
    "seedRatioLimited"            | boolean    true if seedRatioLimit is honored by default
-   "speed-limit-down"            | number     max global download speed (in bytes per second)
+   "speed-limit-down"            | number     max global download speed (KBps)
    "speed-limit-down-enabled"    | boolean    true means enabled
-   "speed-limit-up"              | number     max global upload speed (in bytes per second)
+   "speed-limit-up"              | number     max global upload speed (KBps)
    "speed-limit-up-enabled"      | boolean    true means enabled
    "start-added-torrents"        | boolean    true means added torrents will be started right away
@@ -629 +629 @@
          |         | yes       | torrent-get    | new arg "isFinished"
    ------+---------+-----------+----------------+-------------------------------
-   10    | 2.10    |        NO | torrent-get    | arg "downloadLimit"    is now bytes per second
-         |         |        NO | torrent-get    | arg "uploadLimit"      is now bytes per second
-         |         |        NO | session-get    | arg "speed-limit-down" is now bytes per second
-         |         |        NO | session-get    | arg "speed-limit-up"   is now bytes per second
-         |         |        NO | session-get    | arg "alt-speed-up"     is now bytes per second
-         |         |        NO | session-get    | arg "alt-speed-down"   is now bytes per second
-         |         | yes       | session-get    | new arg "cache-size"
+   10    | 2.10    | yes       | session-get    | new arg "cache-size"
          |         | yes       | session-set    | new arg "trash-original-torrent-files"
          |         | yes       | session-get    | new arg "start-added-torrents"

trunk/gtk/details.c

@@ -220 +220 @@
     /* downLimitSpin */
     if( n ) {
-        const int baseline = tr_torrentGetSpeedLimit_Bps( torrents[0], TR_DOWN ) / speed_K;
+        const int baseline = tr_torrentGetSpeedLimit_KBps( torrents[0], TR_DOWN );
         int i;
         for( i=1; i<n; ++i )
-            if( baseline != ( tr_torrentGetSpeedLimit_Bps( torrents[i], TR_DOWN )  / speed_K ) )
+            if( baseline != ( tr_torrentGetSpeedLimit_KBps( torrents[i], TR_DOWN ) ) )
                 break;
         if( i == n )
@@ -244 +244 @@
     /* upLimitSpin */
     if( n ) {
-        const int baseline = tr_torrentGetSpeedLimit_Bps( torrents[0], TR_UP ) / speed_K;
+        const int baseline = tr_torrentGetSpeedLimit_KBps( torrents[0], TR_UP );
         int i;
         for( i=1; i<n; ++i )
-            if( baseline != ( tr_torrentGetSpeedLimit_Bps( torrents[i], TR_UP ) / speed_K ) )
+            if( baseline != ( tr_torrentGetSpeedLimit_KBps( torrents[i], TR_UP ) ) )
                 break;
         if( i == n )
@@ -601 +601 @@
     const char * stateString;
     char buf[512];
-    double available = 0;
-    double sizeWhenDone = 0;
+    uint64_t available = 0;
+    uint64_t sizeWhenDone = 0;
     const tr_stat ** stats = g_new( const tr_stat*, n );
     const tr_info ** infos = g_new( const tr_info*, n );
@@ -762 +762 @@
         else if( pieceSize >= 0 ) {
             char piecebuf[128];
-            tr_formatter_mem( piecebuf, pieceSize, sizeof( piecebuf ) );
+            tr_formatter_mem_B( piecebuf, pieceSize, sizeof( piecebuf ) );
             g_snprintf( buf, sizeof( buf ),
                         ngettext( "%1$s (%2$'d piece @ %3$s)",
@@ -783 +783 @@
         str = none;
     else {
-        double leftUntilDone = 0;
-        double haveUnchecked = 0;
-        double haveValid = 0;
-        double verifiedPieces = 0;
+        uint64_t leftUntilDone = 0;
+        uint64_t haveUnchecked = 0;
+        uint64_t haveValid = 0;
+        uint32_t verifiedPieces = 0;
         for( i=0; i<n; ++i ) {
             const tr_stat * st = stats[i];
-            const double v = st->haveValid;
             haveUnchecked += st->haveUnchecked;
-            haveValid += v;
-            verifiedPieces += v / tr_torrentInfo(torrents[i])->pieceSize;
+            haveValid += st->haveValid;
+            verifiedPieces += st->haveValid / tr_torrentInfo(torrents[i])->pieceSize;
             sizeWhenDone += st->sizeWhenDone;
             leftUntilDone += st->leftUntilDone;
@@ -1045 +1044 @@
     WEBSEED_COL_WAS_UPDATED,
     WEBSEED_COL_URL,
-    WEBSEED_COL_DOWNLOAD_RATE_INT,
+    WEBSEED_COL_DOWNLOAD_RATE_DOUBLE,
     WEBSEED_COL_DOWNLOAD_RATE_STRING,
     N_WEBSEED_COLS
@@ -1056 +1055 @@
     {
         case WEBSEED_COL_URL: return _( "Webseeds" );
-        case WEBSEED_COL_DOWNLOAD_RATE_INT:
+        case WEBSEED_COL_DOWNLOAD_RATE_DOUBLE:
         case WEBSEED_COL_DOWNLOAD_RATE_STRING: return _( "Down" );
         default: return "";
@@ -1079 +1078 @@
     PEER_COL_ADDRESS,
     PEER_COL_ADDRESS_COLLATED,
-    PEER_COL_DOWNLOAD_RATE_INT,
+    PEER_COL_DOWNLOAD_RATE_DOUBLE,
     PEER_COL_DOWNLOAD_RATE_STRING,
-    PEER_COL_UPLOAD_RATE_INT,
+    PEER_COL_UPLOAD_RATE_DOUBLE,
     PEER_COL_UPLOAD_RATE_STRING,
     PEER_COL_CLIENT,
@@ -1109 +1108 @@
         case PEER_COL_ADDRESS: return _( "Address" );
         case PEER_COL_DOWNLOAD_RATE_STRING:
-        case PEER_COL_DOWNLOAD_RATE_INT: return _( "Down" );
+        case PEER_COL_DOWNLOAD_RATE_DOUBLE: return _( "Down" );
         case PEER_COL_UPLOAD_RATE_STRING:
-        case PEER_COL_UPLOAD_RATE_INT: return _( "Up" );
+        case PEER_COL_UPLOAD_RATE_DOUBLE: return _( "Up" );
         case PEER_COL_CLIENT: return _( "Client" );
         case PEER_COL_PROGRESS: return _( "%" );
@@ -1139 +1138 @@
                                G_TYPE_STRING,   /* address */
                                G_TYPE_STRING,   /* collated address */
-                               G_TYPE_INT,      /* download speed int */
+                               G_TYPE_DOUBLE,   /* download speed int */
                                G_TYPE_STRING,   /* download speed string */
-                               G_TYPE_INT,      /* upload speed int */
+                               G_TYPE_DOUBLE,   /* upload speed int */
                                G_TYPE_STRING,   /* upload speed string  */
                                G_TYPE_STRING,   /* client */
@@ -1203 +1202 @@
     char cancelled_by_client[64];
 
-    if( peer->rateToPeer_Bps > 0 )
-        tr_formatter_speed( up_speed, peer->rateToPeer_Bps, sizeof( up_speed ) );
+    if( peer->rateToPeer_KBps > 0.01 )
+        tr_formatter_speed_KBps( up_speed, peer->rateToPeer_KBps, sizeof( up_speed ) );
     else
         *up_speed = '\0';
 
-    if( peer->rateToClient_Bps > 0 )
-        tr_formatter_speed( down_speed, peer->rateToClient_Bps, sizeof( down_speed ) );
+    if( peer->rateToClient_KBps > 0 )
+        tr_formatter_speed_KBps( down_speed, peer->rateToClient_KBps, sizeof( down_speed ) );
     else
         *down_speed = '\0';
@@ -1249 +1248 @@
                         PEER_COL_DOWNLOAD_REQUEST_COUNT_INT, peer->pendingReqsToPeer,
                         PEER_COL_DOWNLOAD_REQUEST_COUNT_STRING, down_count,
-                        PEER_COL_DOWNLOAD_RATE_INT, peer->rateToClient_Bps,
+                        PEER_COL_DOWNLOAD_RATE_DOUBLE, peer->rateToClient_KBps,
                         PEER_COL_DOWNLOAD_RATE_STRING, down_speed,
-                        PEER_COL_UPLOAD_RATE_INT, peer->rateToPeer_Bps,
+                        PEER_COL_UPLOAD_RATE_DOUBLE, peer->rateToPeer_KBps,
                         PEER_COL_UPLOAD_RATE_STRING, up_speed,
                         PEER_COL_STATUS, peer->flagStr,
@@ -1397 +1396 @@
         const tr_torrent * tor = torrents[i];
         const tr_info * inf = tr_torrentInfo( tor );
-        int * speeds_Bps = tr_torrentWebSpeeds_Bps( tor );
+        double * speeds_KBps = tr_torrentWebSpeeds_KBps( tor );
         for( j=0; j<inf->webseedCount; ++j ) {
             char buf[128];
@@ -1408 +1407 @@
             p = gtk_tree_row_reference_get_path( ref );
             gtk_tree_model_get_iter( model, &iter, p );
-            if( speeds_Bps[j] > 0 )
-                tr_formatter_speed( buf, speeds_Bps[j], sizeof( buf ) );
+            if( speeds_KBps[j] > 0 )
+                tr_formatter_speed_Bps( buf, speeds_KBps[j], sizeof( buf ) );
             else
                 *buf = '\0';
-            gtk_list_store_set( store, &iter, WEBSEED_COL_DOWNLOAD_RATE_INT, speeds_Bps[j],
+            gtk_list_store_set( store, &iter, WEBSEED_COL_DOWNLOAD_RATE_DOUBLE, speeds_KBps[j],
                                               WEBSEED_COL_DOWNLOAD_RATE_STRING, buf,
                                               WEBSEED_COL_WAS_UPDATED, TRUE,
@@ -1418 +1417 @@
             gtk_tree_path_free( p );
         }
-        tr_free( speeds_Bps );
+        tr_free( speeds_KBps );
     }
 
@@ -1612 +1611 @@
                 g_object_set( G_OBJECT( r ), "xalign", 1.0f, NULL );
                 c = gtk_tree_view_column_new_with_attributes( t, r, "text", col, NULL );
-                sort_col = PEER_COL_DOWNLOAD_RATE_INT;
+                sort_col = PEER_COL_DOWNLOAD_RATE_DOUBLE;
                 break;
             case PEER_COL_UPLOAD_RATE_STRING:
@@ -1618 +1617 @@
                 g_object_set( G_OBJECT( r ), "xalign", 1.0f, NULL );
                 c = gtk_tree_view_column_new_with_attributes( t, r, "text", col, NULL );
-                sort_col = PEER_COL_UPLOAD_RATE_INT;
+                sort_col = PEER_COL_UPLOAD_RATE_DOUBLE;
                 break;
 
@@ -1687 +1686 @@
     r = gtk_cell_renderer_text_new( );
     c = gtk_tree_view_column_new_with_attributes( str, r, "text", WEBSEED_COL_DOWNLOAD_RATE_STRING, NULL );
-    gtk_tree_view_column_set_sort_column_id( c, WEBSEED_COL_DOWNLOAD_RATE_INT );
+    gtk_tree_view_column_set_sort_column_id( c, WEBSEED_COL_DOWNLOAD_RATE_DOUBLE );
     gtk_tree_view_append_column( GTK_TREE_VIEW( v ), c );
 

trunk/gtk/main.c

@@ -1204 +1204 @@
         tr_sessionLimitSpeed( tr, TR_DOWN, pref_flag_get( key ) );
     }
-    else if( !strcmp( key, TR_PREFS_KEY_DSPEED_Bps ) )
-    {
-        tr_sessionSetSpeedLimit_Bps( tr, TR_DOWN, pref_int_get( key ) );
+    else if( !strcmp( key, TR_PREFS_KEY_DSPEED_KBps ) )
+    {
+        tr_sessionSetSpeedLimit_KBps( tr, TR_DOWN, pref_int_get( key ) );
     }
     else if( !strcmp( key, TR_PREFS_KEY_USPEED_ENABLED ) )
@@ -1212 +1212 @@
         tr_sessionLimitSpeed( tr, TR_UP, pref_flag_get( key ) );
     }
-    else if( !strcmp( key, TR_PREFS_KEY_USPEED_Bps ) )
-    {
-        tr_sessionSetSpeedLimit_Bps( tr, TR_UP, pref_int_get( key ) );
+    else if( !strcmp( key, TR_PREFS_KEY_USPEED_KBps ) )
+    {
+        tr_sessionSetSpeedLimit_KBps( tr, TR_UP, pref_int_get( key ) );
     }
     else if( !strcmp( key, TR_PREFS_KEY_RATIO_ENABLED ) )
@@ -1300 +1300 @@
         tr_sessionSetProxyPort( tr, pref_int_get( key ) );
     }
-    else if( !strcmp( key, TR_PREFS_KEY_ALT_SPEED_UP_Bps ) )
-    {
-        tr_sessionSetAltSpeed_Bps( tr, TR_UP, pref_int_get( key ) );
-    }
-    else if( !strcmp( key, TR_PREFS_KEY_ALT_SPEED_DOWN_Bps ) )
-    {
-        tr_sessionSetAltSpeed_Bps( tr, TR_DOWN, pref_int_get( key ) );
+    else if( !strcmp( key, TR_PREFS_KEY_ALT_SPEED_UP_KBps ) )
+    {
+        tr_sessionSetAltSpeed_KBps( tr, TR_UP, pref_int_get( key ) );
+    }
+    else if( !strcmp( key, TR_PREFS_KEY_ALT_SPEED_DOWN_KBps ) )
+    {
+        tr_sessionSetAltSpeed_KBps( tr, TR_DOWN, pref_int_get( key ) );
     }
     else if( !strcmp( key, TR_PREFS_KEY_ALT_SPEED_ENABLED ) )

trunk/gtk/msgwin.c

@@ -38 +38 @@
 struct MsgData
 {
-    TrCore *        core;
-    GtkTreeView *   view;
-    GtkListStore *  store;
-    GtkTreeModel *  filter;
-    GtkTreeModel *  sort;
-    int             maxLevel;
+    TrCore        * core;
+    GtkTreeView   * view;
+    GtkListStore  * store;
+    GtkTreeModel  * filter;
+    GtkTreeModel  * sort;
+    tr_msg_level    maxLevel;
     gboolean        isPaused;
     guint           refresh_tag;

trunk/gtk/torrent-cell-renderer.c

@@ -155 +155 @@
 getShortTransferString( const tr_torrent  * tor,
                         const tr_stat     * torStat,
-                        int                 uploadSpeed_Bps,
-                        int                 downloadSpeed_Bps,
+                        double              uploadSpeed_KBps,
+                        double              downloadSpeed_KBps,
                         char              * buf,
                         size_t              buflen )
@@ -166 +166 @@
 
     if( haveDown )
-        tr_strlspeed( downStr, downloadSpeed_Bps, sizeof( downStr ) );
+        tr_formatter_speed_KBps( downStr, downloadSpeed_KBps, sizeof( downStr ) );
     if( haveUp )
-        tr_strlspeed( upStr, uploadSpeed_Bps, sizeof( upStr ) );
+        tr_formatter_speed_KBps( upStr, uploadSpeed_KBps, sizeof( upStr ) );
 
     if( haveDown && haveUp )
@@ -195 +195 @@
 getShortStatusString( const tr_torrent  * tor,
                       const tr_stat     * torStat,
-                      int                 uploadSpeed_Bps,
-                      int                 downloadSpeed_Bps )
+                      double              uploadSpeed_KBps,
+                      double              downloadSpeed_KBps )
 {
     GString * gstr = g_string_new( NULL );
@@ -229 +229 @@
                 g_string_append( gstr, ", " );
             }
-            getShortTransferString( tor, torStat, uploadSpeed_Bps, downloadSpeed_Bps, buf, sizeof( buf ) );
+            getShortTransferString( tor, torStat, uploadSpeed_KBps, downloadSpeed_KBps, buf, sizeof( buf ) );
             g_string_append( gstr, buf );
             break;
@@ -244 +244 @@
 getStatusString( const tr_torrent  * tor,
                  const tr_stat     * torStat,
-                 const int           uploadSpeed_Bps,
-                 const int           downloadSpeed_Bps )
+                 const double        uploadSpeed_KBps,
+                 const double        downloadSpeed_KBps )
 {
     const int isActive = torStat->activity != TR_STATUS_STOPPED;
@@ -266 +266 @@
         case TR_STATUS_CHECK:
         {
-            char * pch = getShortStatusString( tor, torStat, uploadSpeed_Bps, downloadSpeed_Bps );
+            char * pch = getShortStatusString( tor, torStat, uploadSpeed_KBps, downloadSpeed_KBps );
             g_string_assign( gstr, pch );
             g_free( pch );
@@ -310 +310 @@
     {
         char buf[256];
-        getShortTransferString( tor, torStat, uploadSpeed_Bps, downloadSpeed_Bps, buf, sizeof( buf ) );
+        getShortTransferString( tor, torStat, uploadSpeed_KBps, downloadSpeed_KBps, buf, sizeof( buf ) );
         if( *buf )
             g_string_append_printf( gstr, " - %s", buf );
@@ -337 +337 @@
        the individual torrents' speeds and the status bar's overall speed
        in sync even if they refresh at slightly different times */
-    int upload_speed_Bps;
+    double upload_speed_KBps;
 
     /* @see upload_speed_Bps */
-    int download_speed_Bps;
+    double download_speed_KBps;
 
     gboolean compact;
@@ -398 +398 @@
     icon = get_icon( tor, COMPACT_ICON_SIZE, widget );
     name = tr_torrentInfo( tor )->name;
-    status = getShortStatusString( tor, st, p->upload_speed_Bps, p->download_speed_Bps );
+    status = getShortStatusString( tor, st, p->upload_speed_KBps, p->download_speed_KBps );
 
     /* get the idealized cell dimensions */
@@ -456 +456 @@
     icon = get_icon( tor, FULL_ICON_SIZE, widget );
     name = inf->name;
-    status = getStatusString( tor, st, p->upload_speed_Bps, p->download_speed_Bps );
+    status = getStatusString( tor, st, p->upload_speed_KBps, p->download_speed_KBps );
     progress = getProgressString( tor, inf, st );
 
@@ -560 +560 @@
     icon = get_icon( tor, COMPACT_ICON_SIZE, widget );
     name = tr_torrentInfo( tor )->name;
-    status = getShortStatusString( tor, st, p->upload_speed_Bps, p->download_speed_Bps );
+    status = getShortStatusString( tor, st, p->upload_speed_KBps, p->download_speed_KBps );
 
     /* get the cell dimensions */
@@ -664 +664 @@
     icon = get_icon( tor, FULL_ICON_SIZE, widget );
     name = inf->name;
-    status = getStatusString( tor, st, p->upload_speed_Bps, p->download_speed_Bps );
+    status = getStatusString( tor, st, p->upload_speed_KBps, p->download_speed_KBps );
     progress = getProgressString( tor, inf, st );
 
@@ -783 +783 @@
     switch( property_id )
     {
-        case P_TORRENT:        p->tor                = g_value_get_pointer( v ); break;
-        case P_UPLOAD_SPEED:   p->upload_speed_Bps   = g_value_get_int( v ); break;
-        case P_DOWNLOAD_SPEED: p->download_speed_Bps = g_value_get_int( v ); break;
-        case P_BAR_HEIGHT:     p->bar_height         = g_value_get_int( v ); break;
-        case P_COMPACT:        p->compact            = g_value_get_boolean( v ); break;
+        case P_TORRENT:        p->tor                 = g_value_get_pointer( v ); break;
+        case P_UPLOAD_SPEED:   p->upload_speed_KBps   = g_value_get_double( v ); break;
+        case P_DOWNLOAD_SPEED: p->download_speed_KBps = g_value_get_double( v ); break;
+        case P_BAR_HEIGHT:     p->bar_height          = g_value_get_int( v ); break;
+        case P_COMPACT:        p->compact             = g_value_get_boolean( v ); break;
         default: G_OBJECT_WARN_INVALID_PROPERTY_ID( object, property_id, pspec ); break;
     }
@@ -804 +804 @@
     {
         case P_TORRENT:        g_value_set_pointer( v, p->tor ); break;
-        case P_UPLOAD_SPEED:   g_value_set_int( v, p->upload_speed_Bps ); break;
-        case P_DOWNLOAD_SPEED: g_value_set_int( v, p->download_speed_Bps ); break;
+        case P_UPLOAD_SPEED:   g_value_set_double( v, p->upload_speed_KBps ); break;
+        case P_DOWNLOAD_SPEED: g_value_set_double( v, p->download_speed_KBps ); break;
         case P_BAR_HEIGHT:     g_value_set_int( v, p->bar_height ); break;
         case P_COMPACT:        g_value_set_boolean( v, p->compact ); break;
@@ -854 +854 @@
 
     g_object_class_install_property( gobject_class, P_UPLOAD_SPEED,
-                                    g_param_spec_int( "piece-upload-speed", NULL,
-                                                      "tr_stat.pieceUploadSpeed_Bps",
-                                                      0, INT_MAX, 0,
-                                                      G_PARAM_READWRITE ) );
+                                    g_param_spec_double( "piece-upload-speed", NULL,
+                                                         "tr_stat.pieceUploadSpeed_KBps",
+                                                         0, INT_MAX, 0,
+                                                         G_PARAM_READWRITE ) );
 
     g_object_class_install_property( gobject_class, P_DOWNLOAD_SPEED,
-                                    g_param_spec_int( "piece-download-speed", NULL,
-                                                      "tr_stat.pieceDownloadSpeed_Bps",
-                                                      0, INT_MAX, 0,
-                                                      G_PARAM_READWRITE ) );
+                                    g_param_spec_double( "piece-download-speed", NULL,
+                                                         "tr_stat.pieceDownloadSpeed_KBps",
+                                                         0, INT_MAX, 0,
+                                                         G_PARAM_READWRITE ) );
 
     g_object_class_install_property( gobject_class, P_BAR_HEIGHT,

trunk/gtk/tr-core.c

@@ -777 +777 @@
                       TR_TORRENT_TYPE,  /* TrTorrent object */
                       G_TYPE_POINTER,   /* tr_torrent* */
-                      G_TYPE_INT,       /* tr_stat.pieceUploadSpeed_Bps */
-                      G_TYPE_INT,       /* tr_stat.pieceDownloadSpeed_Bps */
+                      G_TYPE_DOUBLE,    /* tr_stat.pieceUploadSpeed_KBps */
+                      G_TYPE_DOUBLE,    /* tr_stat.pieceDownloadSpeed_KBps */
                       G_TYPE_INT };     /* tr_stat.status */
 
@@ -921 +921 @@
                                        MC_TORRENT,       gtor,
                                        MC_TORRENT_RAW,   tor,
-                                       MC_SPEED_UP,      st->pieceUploadSpeed_Bps,
-                                       MC_SPEED_DOWN,    st->pieceDownloadSpeed_Bps,
+                                       MC_SPEED_UP,      st->pieceUploadSpeed_KBps,
+                                       MC_SPEED_DOWN,    st->pieceDownloadSpeed_KBps,
                                        MC_ACTIVITY,      st->activity,
                                        -1 );
@@ -1323 +1323 @@
 {
     int oldActivity, newActivity;
-    int oldUpSpeed, newUpSpeed;
-    int oldDownSpeed, newDownSpeed;
+    double oldUpSpeed, newUpSpeed;
+    double oldDownSpeed, newDownSpeed;
     const tr_stat * st;
     TrTorrent * gtor;
@@ -1339 +1339 @@
     st = tr_torrentStat( tr_torrent_handle( gtor ) );
     newActivity = st->activity;
-    newUpSpeed = st->pieceUploadSpeed_Bps;
-    newDownSpeed = st->pieceDownloadSpeed_Bps;
+    newUpSpeed = st->pieceUploadSpeed_KBps;
+    newDownSpeed = st->pieceDownloadSpeed_KBps;
 
     /* updating the model triggers off resort/refresh,
        so don't do it unless something's actually changed... */
-    if( ( newActivity  != oldActivity  ) ||
-        ( newUpSpeed   != oldUpSpeed   ) ||
-        ( newDownSpeed != oldDownSpeed ) )
+    if( ( newActivity  != oldActivity  )
+        || gtr_compare_double( newUpSpeed, oldUpSpeed, 3 )
+        || gtr_compare_double( newDownSpeed, oldDownSpeed, 3 ) )
     {
         gtk_list_store_set( GTK_LIST_STORE( model ), iter,
@@ -1576 +1576 @@
     const double oldval = pref_double_get( key );
 
-    if( oldval != newval )
+    if( gtr_compare_double( oldval, newval, 4 ) )
     {
         pref_double_set( key, newval );

trunk/gtk/tr-icon.c

@@ -68 +68 @@
 tr_icon_refresh( gpointer vicon )
 {
-    int Bps;
-    int limit;
+    double KBps;
+    double limit;
     char up[64];
     char upLimit[64];
@@ -80 +80 @@
 
     /* up */
-    Bps = tr_sessionGetRawSpeed_Bps( session, TR_UP );
-    if( Bps < 1 )
+    KBps = tr_sessionGetRawSpeed_KBps( session, TR_UP );
+    if( KBps < 0.001 )
         g_strlcpy( up, idle, sizeof( up ) );
     else
-        tr_formatter_speed( up, Bps, sizeof( up ) );
+        tr_formatter_speed_KBps( up, KBps, sizeof( up ) );
 
     /* up limit */
-    if( !tr_sessionGetActiveSpeedLimit_Bps( session, TR_UP, &limit ) )
+    if( !tr_sessionGetActiveSpeedLimit_KBps( session, TR_UP, &limit ) )
         *upLimit = '\0';
     else {
         char buf[64];
-        tr_strlspeed( buf, limit, sizeof( buf ) );
+        tr_formatter_speed_KBps( buf, limit, sizeof( buf ) );
         g_snprintf( upLimit, sizeof( upLimit ), _( "(Limit: %s)" ), buf );
     }
 
     /* down */
-    Bps = tr_sessionGetRawSpeed_Bps( session, TR_DOWN );
-    if( Bps < 1 )
+    KBps = tr_sessionGetRawSpeed_KBps( session, TR_DOWN );
+    if( KBps < 0.001 )
         g_strlcpy( down, idle, sizeof( down ) );
     else
-        tr_formatter_speed( down, Bps, sizeof( down ) );
+        tr_formatter_speed_KBps( down, KBps, sizeof( down ) );
 
     /* down limit */
-    if( !tr_sessionGetActiveSpeedLimit_Bps( session, TR_DOWN, &limit ) )
+    if( !tr_sessionGetActiveSpeedLimit_KBps( session, TR_DOWN, &limit ) )
         *downLimit = '\0';
     else {
         char buf[64];
-        tr_strlspeed( buf, limit, sizeof( buf ) );
+        tr_formatter_speed_KBps( buf, limit, sizeof( buf ) );
         g_snprintf( downLimit, sizeof( downLimit ), _( "(Limit: %s)" ), buf );
     }

trunk/gtk/tr-prefs.c

@@ -31 +31 @@
 **/
 
-#define MULTIPLIER_KEY "multiplier-key"
 #define PREF_KEY "pref-key"
 
@@ -107 +106 @@
         /* update the core */
         const char * key = g_object_get_data( o, PREF_KEY );
-        const int multiplier = GPOINTER_TO_INT( g_object_get_data( o, MULTIPLIER_KEY ) );
 
         if (data->isDouble)
         {
-            const double value = gtk_spin_button_get_value( GTK_SPIN_BUTTON( spin ) ) * multiplier;
+            const double value = gtk_spin_button_get_value( GTK_SPIN_BUTTON( spin ) );
             tr_core_set_pref_double( TR_CORE( data->core ), key, value );
         }
         else
         {
-            const int value = gtk_spin_button_get_value_as_int( GTK_SPIN_BUTTON( spin ) ) * multiplier;
+            const int value = gtk_spin_button_get_value_as_int( GTK_SPIN_BUTTON( spin ) );
             tr_core_set_pref_int( TR_CORE( data->core ), key, value );
         }
@@ -165 +163 @@
 new_spin_button( const char * key,
                  gpointer     core,
-                 int          multiplier,
                  int          low,
                  int          high,
@@ -171 +168 @@
 {
     GtkWidget * w = gtk_spin_button_new_with_range( low, high, step );
-    g_object_set_data( G_OBJECT( w ), MULTIPLIER_KEY, GINT_TO_POINTER( multiplier ) );
     g_object_set_data_full( G_OBJECT( w ), PREF_KEY, g_strdup( key ), g_free );
     gtk_spin_button_set_digits( GTK_SPIN_BUTTON( w ), 0 );
-    gtk_spin_button_set_value( GTK_SPIN_BUTTON( w ), pref_int_get( key ) / multiplier );
+    gtk_spin_button_set_value( GTK_SPIN_BUTTON( w ), pref_int_get( key ) );
     g_signal_connect( w, "value-changed", G_CALLBACK( spun_cb_int ), core );
     return w;
@@ -182 +178 @@
 new_spin_button_double( const char * key,
                        gpointer      core,
-                       int           multiplier,
                        double        low,
                        double        high,
@@ -188 +183 @@
 {
     GtkWidget * w = gtk_spin_button_new_with_range( low, high, step );
-    g_object_set_data( G_OBJECT( w ), MULTIPLIER_KEY, GINT_TO_POINTER( multiplier ) );
     g_object_set_data_full( G_OBJECT( w ), PREF_KEY, g_strdup( key ), g_free );
     gtk_spin_button_set_digits( GTK_SPIN_BUTTON( w ), 2 );
@@ -330 +324 @@
     s = _( "_Seed torrent until its ratio reaches:" );
     w = new_check_button( s, TR_PREFS_KEY_RATIO_ENABLED, core );
-    w2 = new_spin_button_double( TR_PREFS_KEY_RATIO, core, 1, 0, INT_MAX, .05 );
+    w2 = new_spin_button_double( TR_PREFS_KEY_RATIO, core, 0, INT_MAX, .05 );
     gtk_widget_set_sensitive( GTK_WIDGET( w2 ), pref_flag_get( TR_PREFS_KEY_RATIO_ENABLED ) );
     g_signal_connect( w, "toggled", G_CALLBACK( target_cb ), w2 );
@@ -807 +801 @@
 
     /* port */
-    w = new_spin_button( TR_PREFS_KEY_RPC_PORT, core, 1, 0, USHRT_MAX, 1 );
+    w = new_spin_button( TR_PREFS_KEY_RPC_PORT, core, 0, USHRT_MAX, 1 );
     page->widgets = g_slist_append( page->widgets, w );
     w = hig_workarea_add_row( t, &row, _( "Listening _port:" ), w, NULL );
@@ -1012 +1006 @@
     page->proxy_widgets = g_slist_append( page->proxy_widgets, w );
 
-    w = new_spin_button( TR_PREFS_KEY_PROXY_PORT, core, 1, 0, USHRT_MAX, 1 );
+    w = new_spin_button( TR_PREFS_KEY_PROXY_PORT, core, 0, USHRT_MAX, 1 );
     page->proxy_widgets = g_slist_append( page->proxy_widgets, w );
     w = hig_workarea_add_row( t, &row, _( "Proxy _port:" ), w, NULL );
@@ -1220 +1214 @@
         g_snprintf( buf, sizeof( buf ), _( "Limit _download speed (%s):" ), _(speed_K_str) );
         w = new_check_button( buf, TR_PREFS_KEY_DSPEED_ENABLED, core );
-        w2 = new_spin_button( TR_PREFS_KEY_DSPEED_Bps, core, speed_K, 0, INT_MAX, 5 );
+        w2 = new_spin_button( TR_PREFS_KEY_DSPEED_KBps, core, 0, INT_MAX, 5 );
         gtk_widget_set_sensitive( GTK_WIDGET( w2 ), pref_flag_get( TR_PREFS_KEY_DSPEED_ENABLED ) );
         g_signal_connect( w, "toggled", G_CALLBACK( target_cb ), w2 );
@@ -1227 +1221 @@
         g_snprintf( buf, sizeof( buf ), _( "Limit _upload speed (%s):" ), _(speed_K_str) );
         w = new_check_button( buf, TR_PREFS_KEY_USPEED_ENABLED, core );
-        w2 = new_spin_button( TR_PREFS_KEY_USPEED_Bps, core, speed_K, 0, INT_MAX, 5 );
+        w2 = new_spin_button( TR_PREFS_KEY_USPEED_KBps, core, 0, INT_MAX, 5 );
         gtk_widget_set_sensitive( GTK_WIDGET( w2 ), pref_flag_get( TR_PREFS_KEY_USPEED_ENABLED ) );
         g_signal_connect( w, "toggled", G_CALLBACK( target_cb ), w2 );
@@ -1251 +1245 @@
 
         g_snprintf( buf, sizeof( buf ), _( "Limit do_wnload speed (%s):" ), _(speed_K_str) );
-        w = new_spin_button( TR_PREFS_KEY_ALT_SPEED_DOWN_Bps, core, speed_K, 0, INT_MAX, 5 );
+        w = new_spin_button( TR_PREFS_KEY_ALT_SPEED_DOWN_KBps, core, 0, INT_MAX, 5 );
         hig_workarea_add_row( t, &row, buf, w, NULL );
 
         g_snprintf( buf, sizeof( buf ), _( "Limit u_pload speed (%s):" ), _(speed_K_str) );
-        w = new_spin_button( TR_PREFS_KEY_ALT_SPEED_UP_Bps, core, speed_K, 0, INT_MAX, 5 );
+        w = new_spin_button( TR_PREFS_KEY_ALT_SPEED_UP_KBps, core, 0, INT_MAX, 5 );
         hig_workarea_add_row( t, &row, buf, w, NULL );
 
@@ -1370 +1364 @@
 
     s = _( "_Port for incoming connections:" );
-    w = data->portSpin = new_spin_button( TR_PREFS_KEY_PEER_PORT, core, 1, 1, USHRT_MAX, 1 );
+    w = data->portSpin = new_spin_button( TR_PREFS_KEY_PEER_PORT, core, 1, USHRT_MAX, 1 );
     hig_workarea_add_row( t, &row, s, w, NULL );
 
@@ -1395 +1389 @@
     hig_workarea_add_section_title( t, &row, _( "Limits" ) );
 
-    w = new_spin_button( TR_PREFS_KEY_PEER_LIMIT_TORRENT, core, 1, 1, 300, 5 );
+    w = new_spin_button( TR_PREFS_KEY_PEER_LIMIT_TORRENT, core, 1, 300, 5 );
     hig_workarea_add_row( t, &row, _( "Maximum peers per _torrent:" ), w, NULL );
-    w = new_spin_button( TR_PREFS_KEY_PEER_LIMIT_GLOBAL, core, 1, 1, 3000, 5 );
+    w = new_spin_button( TR_PREFS_KEY_PEER_LIMIT_GLOBAL, core, 1, 3000, 5 );
     hig_workarea_add_row( t, &row, _( "Maximum peers _overall:" ), w, NULL );
 

trunk/gtk/tr-window.c

@@ -206 +206 @@
     }
     else if( !strcmp( key, TR_PREFS_KEY_ALT_SPEED_ENABLED ) ||
-             !strcmp( key, TR_PREFS_KEY_ALT_SPEED_UP_Bps ) ||
-             !strcmp( key, TR_PREFS_KEY_ALT_SPEED_DOWN_Bps ) )
+             !strcmp( key, TR_PREFS_KEY_ALT_SPEED_UP_KBps ) ||
+             !strcmp( key, TR_PREFS_KEY_ALT_SPEED_DOWN_KBps ) )
     {
         syncAltSpeedButton( p );
@@ -267 +267 @@
     GtkWidget * w = p->alt_speed_button;
 
-    tr_strlspeed( u, pref_int_get( TR_PREFS_KEY_ALT_SPEED_UP_Bps ), sizeof( u ) );
-    tr_strlspeed( d, pref_int_get( TR_PREFS_KEY_ALT_SPEED_DOWN_Bps ), sizeof( d ) );
+    tr_formatter_speed_KBps( u, pref_int_get( TR_PREFS_KEY_ALT_SPEED_UP_KBps ), sizeof( u ) );
+    tr_formatter_speed_KBps( d, pref_int_get( TR_PREFS_KEY_ALT_SPEED_DOWN_KBps ), sizeof( d ) );
     fmt = b ? _( "Click to disable Temporary Speed Limits\n(%1$s down, %2$s up)" )
             : _( "Click to enable Temporary Speed Limits\n(%1$s down, %2$s up)" );
@@ -389 +389 @@
     PrivateData * p = vp;
     GObject * o = G_OBJECT( check );
-    const int Bps = GPOINTER_TO_INT( g_object_get_data( o, SPEED_KEY ) ) * speed_K;
+    const int KBps = GPOINTER_TO_INT( g_object_get_data( o, SPEED_KEY ) );
     tr_direction dir = GPOINTER_TO_INT( g_object_get_data( o, DIRECTION_KEY ) );
 
-    key = dir==TR_UP ? TR_PREFS_KEY_USPEED_Bps : TR_PREFS_KEY_DSPEED_Bps;
-    tr_core_set_pref_int( p->core, key, Bps );
+    key = dir==TR_UP ? TR_PREFS_KEY_USPEED_KBps : TR_PREFS_KEY_DSPEED_KBps;
+    tr_core_set_pref_int( p->core, key, KBps );
 
     key = dir==TR_UP ? TR_PREFS_KEY_USPEED_ENABLED : TR_PREFS_KEY_DSPEED_ENABLED;
@@ -542 +542 @@
 
     w = p->speedlimit_on_item[TR_DOWN];
-    tr_strlspeed( buf1, pref_int_get( TR_PREFS_KEY_DSPEED_Bps ), sizeof( buf1 ) );
+    tr_formatter_speed_KBps( buf1, pref_int_get( TR_PREFS_KEY_DSPEED_KBps ), sizeof( buf1 ) );
     gtk_label_set_text( GTK_LABEL( gtk_bin_get_child( GTK_BIN( w ) ) ), buf1 );
 
@@ -550 +550 @@
 
     w = p->speedlimit_on_item[TR_UP];
-    tr_strlspeed( buf1, pref_int_get( TR_PREFS_KEY_USPEED_Bps ), sizeof( buf1 ) );
+    tr_formatter_speed_KBps( buf1, pref_int_get( TR_PREFS_KEY_USPEED_KBps ), sizeof( buf1 ) );
     gtk_label_set_text( GTK_LABEL( gtk_bin_get_child( GTK_BIN( w ) ) ), buf1 );
 
@@ -843 +843 @@
     {
         char buf[128];
-        int up=0, down=0;
+        double up=0, down=0;
         GtkTreeIter iter;
         GtkTreeModel * model = tr_core_model( p->core );
@@ -849 +849 @@
         if( gtk_tree_model_get_iter_first( model, &iter ) ) do
         {
-            int u, d;
+            double u, d;
             gtk_tree_model_get( model, &iter, MC_SPEED_UP, &u,
                                               MC_SPEED_DOWN, &d,
@@ -858 +858 @@
         while( gtk_tree_model_iter_next( model, &iter ) );
 
-        tr_strlspeed( buf, down, sizeof( buf ) );
+        tr_formatter_speed_KBps( buf, down, sizeof( buf ) );
         gtk_label_set_text( GTK_LABEL( p->dl_lb ), buf );
 
-        tr_strlspeed( buf, up, sizeof( buf ) );
+        tr_formatter_speed_KBps( buf, up, sizeof( buf ) );
         gtk_label_set_text( GTK_LABEL( p->ul_lb ), buf );
     }

trunk/gtk/tr-window.h

@@ -27 +27 @@
 
 #include <gtk/gtk.h>
+#include <libtransmission/utils.h> /* tr_formatter_speed_KBps() */
 #include "tr-core.h"
 

trunk/gtk/util.c

@@ -13 +13 @@
 #include <ctype.h> /* isxdigit() */
 #include <errno.h>
+#include <math.h> /* pow() */
 #include <stdlib.h> /* free() */
 #include <string.h> /* strcmp() */
@@ -128 +129 @@
 ***/
 
+int
+gtr_compare_double( const double a, const double b, int decimal_places )
+{
+    const int64_t ia = (int64_t)(a * pow( 10, decimal_places ) );
+    const int64_t ib = (int64_t)(b * pow( 10, decimal_places ) );
+    if( ia < ib ) return -1;
+    if( ia > ib ) return  1; 
+    return 0;
+}
+
+/***
+****
+***/
+
 const char*
 gtr_get_unicode_string( int i )
@@ -157 +172 @@
         g_strlcpy( buf, _( "None" ), buflen );
     else
-        tr_formatter_size( buf, bytes, buflen );
+        tr_formatter_size_B( buf, bytes, buflen );
 
     return buf;
@@ -168 +183 @@
         g_strlcpy( buf, _( "None" ), buflen );
     else
-        tr_formatter_speed( buf, bytes_per_second, buflen );
+        tr_formatter_speed_Bps( buf, bytes_per_second, buflen );
 
     return buf;

trunk/gtk/util.h

@@ -78 +78 @@
 char* gtr_localtime( time_t time );
 
+
+int gtr_compare_double( const double a, const double b, int decimal_places );
+
+
 /***
 ****

trunk/libtransmission/cache.c

@@ -226 +226 @@
     cache->max_blocks = getMaxBlocks( max_bytes );
 
-    tr_formatter_mem( buf, cache->max_bytes, sizeof( buf ) );
+    tr_formatter_mem_B( buf, cache->max_bytes, sizeof( buf ) );
     tr_ndbg( MY_NAME, "Maximum cache size set to %s (%d blocks)", buf, cache->max_blocks );
 

trunk/libtransmission/peer-mgr.c

@@ -2270 +2270 @@
 
 
-int*
-tr_peerMgrWebSpeeds_Bps( const tr_torrent * tor )
+double*
+tr_peerMgrWebSpeeds_KBps( const tr_torrent * tor )
 {
     const Torrent * t = tor->torrentPeers;
@@ -2277 +2277 @@
     int i;
     int webseedCount;
-    int * ret;
+    double * ret;
     uint64_t now;
 
@@ -2286 +2286 @@
     webseedCount = tr_ptrArraySize( &t->webseeds );
     assert( webseedCount == tor->info.webseedCount );
-    ret = tr_new0( int, webseedCount );
+    ret = tr_new0( double, webseedCount );
     now = tr_date( );
 
-    for( i=0; i<webseedCount; ++i )
-        if( !tr_webseedGetSpeed_Bps( webseeds[i], now, &ret[i] ) )
+    for( i=0; i<webseedCount; ++i ) {
+        int Bps;
+        if( tr_webseedGetSpeed_Bps( webseeds[i], now, &Bps ) )
+            ret[i] = Bps / (double)tr_speed_K;
+        else
             ret[i] = -1.0;
+    }
 
     managerUnlock( t->manager );
@@ -2337 +2341 @@
         stat->progress            = peer->progress;
         stat->isEncrypted         = tr_peerIoIsEncrypted( peer->io ) ? 1 : 0;
-        stat->rateToPeer_Bps      = tr_peerGetPieceSpeed_Bps( peer, now, TR_CLIENT_TO_PEER );
-        stat->rateToClient_Bps    = tr_peerGetPieceSpeed_Bps( peer, now, TR_PEER_TO_CLIENT );
+        stat->rateToPeer_KBps     = toSpeedKBps( tr_peerGetPieceSpeed_Bps( peer, now, TR_CLIENT_TO_PEER ) );
+        stat->rateToClient_KBps   = toSpeedKBps( tr_peerGetPieceSpeed_Bps( peer, now, TR_PEER_TO_CLIENT ) );
         stat->peerIsChoked        = peer->peerIsChoked;
         stat->peerIsInterested    = peer->peerIsInterested;

trunk/libtransmission/peer-mgr.h

@@ -228 +228 @@
 int tr_peerMgrGetWebseedSpeed_Bps( const tr_torrent * tor, uint64_t now );
 
-int* tr_peerMgrWebSpeeds_Bps( const tr_torrent * tor );
+double* tr_peerMgrWebSpeeds_KBps( const tr_torrent * tor );
 
 

trunk/libtransmission/rpcimpl.c

@@ -443 +443 @@
         tr_bencDictAddInt ( d, "port", peer->port );
         tr_bencDictAddReal( d, "progress", peer->progress );
-        tr_bencDictAddInt ( d, "rateToClient", peer->rateToClient_Bps );
-        tr_bencDictAddInt ( d, "rateToPeer", peer->rateToPeer_Bps );
+        tr_bencDictAddReal( d, "rateToClient", peer->rateToClient_KBps );
+        tr_bencDictAddReal( d, "rateToPeer", peer->rateToPeer_KBps );
     }
 
@@ -485 +485 @@
         tr_bencDictAddInt( d, key, st->downloadedEver );
     else if( tr_streq( key, keylen, "downloadLimit" ) )
-        tr_bencDictAddInt( d, key, tr_torrentGetSpeedLimit_Bps( tor, TR_DOWN ) );
+        tr_bencDictAddReal( d, key, tr_torrentGetSpeedLimit_KBps( tor, TR_DOWN ) );
     else if( tr_streq( key, keylen, "downloadLimited" ) )
         tr_bencDictAddBool( d, key, tr_torrentUsesSpeedLimit( tor, TR_DOWN ) );
@@ -570 +570 @@
     }
     else if( tr_streq( key, keylen, "rateDownload" ) )
-        tr_bencDictAddInt( d, key, st->pieceDownloadSpeed_Bps );
+        tr_bencDictAddReal( d, key, st->pieceDownloadSpeed_KBps );
     else if( tr_streq( key, keylen, "rateUpload" ) )
-        tr_bencDictAddInt( d, key, st->pieceUploadSpeed_Bps );
+        tr_bencDictAddReal( d, key, st->pieceUploadSpeed_KBps );
     else if( tr_streq( key, keylen, "recheckProgress" ) )
         tr_bencDictAddReal( d, key, st->recheckProgress );
@@ -600 +600 @@
         tr_bencDictAddInt( d, key, st->uploadedEver );
     else if( tr_streq( key, keylen, "uploadLimit" ) )
-        tr_bencDictAddInt( d, key, tr_torrentGetSpeedLimit_Bps( tor, TR_UP ) );
+        tr_bencDictAddInt( d, key, tr_torrentGetSpeedLimit_KBps( tor, TR_UP ) );
     else if( tr_streq( key, keylen, "uploadLimited" ) )
         tr_bencDictAddBool( d, key, tr_torrentUsesSpeedLimit( tor, TR_UP ) );
@@ -1005 +1005 @@
             errmsg = setFilePriorities( tor, TR_PRI_NORMAL, files );
         if( tr_bencDictFindInt( args_in, "downloadLimit", &tmp ) )
-            tr_torrentSetSpeedLimit_Bps( tor, TR_DOWN, tmp );
+            tr_torrentSetSpeedLimit_KBps( tor, TR_DOWN, tmp );
         if( tr_bencDictFindBool( args_in, "downloadLimited", &boolVal ) )
             tr_torrentUseSpeedLimit( tor, TR_DOWN, boolVal );
@@ -1011 +1011 @@
             tr_torrentUseSessionLimits( tor, boolVal );
         if( tr_bencDictFindInt( args_in, "uploadLimit", &tmp ) )
-            tr_torrentSetSpeedLimit_Bps( tor, TR_UP, tmp );
+            tr_torrentSetSpeedLimit_KBps( tor, TR_UP, tmp );
         if( tr_bencDictFindBool( args_in, "uploadLimited", &boolVal ) )
             tr_torrentUseSpeedLimit( tor, TR_UP, boolVal );
@@ -1408 +1408 @@
     assert( idle_data == NULL );
 
-    if( tr_bencDictFindInt( args_in, TR_PREFS_KEY_MAX_CACHE_SIZE, &i ) )
-        tr_sessionSetCacheLimit( session, d );
-    if( tr_bencDictFindInt( args_in, TR_PREFS_KEY_ALT_SPEED_UP_Bps, &i ) )
-        tr_sessionSetAltSpeed_Bps( session, TR_UP, i );
-    if( tr_bencDictFindInt( args_in, TR_PREFS_KEY_ALT_SPEED_DOWN_Bps, &i ) )
-        tr_sessionSetAltSpeed_Bps( session, TR_DOWN, i );
+    if( tr_bencDictFindInt( args_in, TR_PREFS_KEY_MAX_CACHE_SIZE_MB, &i ) )
+        tr_sessionSetCacheLimit_MB( session, i );
+    if( tr_bencDictFindInt( args_in, TR_PREFS_KEY_ALT_SPEED_UP_KBps, &i ) )
+        tr_sessionSetAltSpeed_KBps( session, TR_UP, i );
+    if( tr_bencDictFindInt( args_in, TR_PREFS_KEY_ALT_SPEED_DOWN_KBps, &i ) )
+        tr_sessionSetAltSpeed_KBps( session, TR_DOWN, i );
     if( tr_bencDictFindBool( args_in, TR_PREFS_KEY_ALT_SPEED_ENABLED, &boolVal ) )
         tr_sessionUseAltSpeed( session, boolVal );
@@ -1462 +1462 @@
     if( tr_bencDictFindBool( args_in, TR_PREFS_KEY_TRASH_ORIGINAL, &boolVal ) )
         tr_sessionSetDeleteSource( session, boolVal );
-    if( tr_bencDictFindInt( args_in, TR_PREFS_KEY_DSPEED_Bps, &i ) )
-        tr_sessionSetSpeedLimit_Bps( session, TR_DOWN, i );
+    if( tr_bencDictFindInt( args_in, TR_PREFS_KEY_DSPEED_KBps, &i ) )
+        tr_sessionSetSpeedLimit_KBps( session, TR_DOWN, i );
     if( tr_bencDictFindBool( args_in, TR_PREFS_KEY_DSPEED_ENABLED, &boolVal ) )
         tr_sessionLimitSpeed( session, TR_DOWN, boolVal );
-    if( tr_bencDictFindInt( args_in, TR_PREFS_KEY_USPEED_Bps, &i ) )
-        tr_sessionSetSpeedLimit_Bps( session, TR_UP, i );
+    if( tr_bencDictFindInt( args_in, TR_PREFS_KEY_USPEED_KBps, &i ) )
+        tr_sessionSetSpeedLimit_KBps( session, TR_UP, i );
     if( tr_bencDictFindBool( args_in, TR_PREFS_KEY_USPEED_ENABLED, &boolVal ) )
         tr_sessionLimitSpeed( session, TR_UP, boolVal );
@@ -1508 +1508 @@
     tr_sessionGetCumulativeStats( session, &cumulativeStats );
 
-    tr_bencDictAddInt( args_out, "activeTorrentCount", running );
-    tr_bencDictAddInt( args_out, "downloadSpeed", tr_sessionGetPieceSpeed_Bps( session, TR_DOWN ) );
-    tr_bencDictAddInt( args_out, "pausedTorrentCount", total - running );
-    tr_bencDictAddInt( args_out, "torrentCount", total );
-    tr_bencDictAddInt( args_out, "uploadSpeed", tr_sessionGetPieceSpeed_Bps( session, TR_UP ) );
+    tr_bencDictAddInt ( args_out, "activeTorrentCount", running );
+    tr_bencDictAddReal( args_out, "downloadSpeed", tr_sessionGetPieceSpeed_KBps( session, TR_DOWN ) );
+    tr_bencDictAddInt ( args_out, "pausedTorrentCount", total - running );
+    tr_bencDictAddInt ( args_out, "torrentCount", total );
+    tr_bencDictAddReal( args_out, "uploadSpeed", tr_sessionGetPieceSpeed_KBps( session, TR_UP ) );
 
     d = tr_bencDictAddDict( args_out, "cumulative-stats", 5 );
@@ -1541 +1541 @@
 
     assert( idle_data == NULL );
-    tr_bencDictAddInt ( d, TR_PREFS_KEY_ALT_SPEED_UP_Bps, tr_sessionGetAltSpeed_Bps(s,TR_UP) );
-    tr_bencDictAddInt ( d, TR_PREFS_KEY_ALT_SPEED_DOWN_Bps, tr_sessionGetAltSpeed_Bps(s,TR_DOWN) );
+    tr_bencDictAddInt ( d, TR_PREFS_KEY_ALT_SPEED_UP_KBps, tr_sessionGetAltSpeed_KBps(s,TR_UP) );
+    tr_bencDictAddInt ( d, TR_PREFS_KEY_ALT_SPEED_DOWN_KBps, tr_sessionGetAltSpeed_KBps(s,TR_DOWN) );
     tr_bencDictAddBool( d, TR_PREFS_KEY_ALT_SPEED_ENABLED, tr_sessionUsesAltSpeed(s) );
     tr_bencDictAddInt ( d, TR_PREFS_KEY_ALT_SPEED_TIME_BEGIN, tr_sessionGetAltSpeedBegin(s) );
@@ -1549 +1549 @@
     tr_bencDictAddBool( d, TR_PREFS_KEY_ALT_SPEED_TIME_ENABLED, tr_sessionUsesAltSpeedTime(s) );
     tr_bencDictAddBool( d, TR_PREFS_KEY_BLOCKLIST_ENABLED, tr_blocklistIsEnabled( s ) );
-    tr_bencDictAddReal( d, TR_PREFS_KEY_MAX_CACHE_SIZE, tr_sessionGetCacheLimit( s ) );
+    tr_bencDictAddReal( d, TR_PREFS_KEY_MAX_CACHE_SIZE_MB, tr_sessionGetCacheLimit_MB( s ) );
     tr_bencDictAddInt ( d, "blocklist-size", tr_blocklistGetRuleCount( s ) );
     tr_bencDictAddStr ( d, "config-dir", tr_sessionGetConfigDir( s ) );
@@ -1570 +1570 @@
     tr_bencDictAddBool( d, TR_PREFS_KEY_START, !tr_sessionGetPaused( s ) );
     tr_bencDictAddBool( d, TR_PREFS_KEY_TRASH_ORIGINAL, tr_sessionGetDeleteSource( s ) );
-    tr_bencDictAddInt ( d, TR_PREFS_KEY_USPEED_Bps, tr_sessionGetSpeedLimit_Bps( s, TR_UP ) );
+    tr_bencDictAddInt ( d, TR_PREFS_KEY_USPEED_KBps, tr_sessionGetSpeedLimit_KBps( s, TR_UP ) );
     tr_bencDictAddBool( d, TR_PREFS_KEY_USPEED_ENABLED, tr_sessionIsSpeedLimited( s, TR_UP ) );
-    tr_bencDictAddInt ( d, TR_PREFS_KEY_DSPEED_Bps, tr_sessionGetSpeedLimit_Bps( s, TR_DOWN ) );
+    tr_bencDictAddInt ( d, TR_PREFS_KEY_DSPEED_KBps, tr_sessionGetSpeedLimit_KBps( s, TR_DOWN ) );
     tr_bencDictAddBool( d, TR_PREFS_KEY_DSPEED_ENABLED, tr_sessionIsSpeedLimited( s, TR_DOWN ) );
     tr_bencDictAddStr ( d, TR_PREFS_KEY_SCRIPT_TORRENT_DONE_FILENAME, tr_sessionGetTorrentDoneScript( s ) );

trunk/libtransmission/session.c

@@ -56 +56 @@
     SAVE_INTERVAL_SECS = 120,
 
-    DEFAULT_CACHE_SIZE_BYTES = ( 2 * 1024 * 1024 ) /* 2 MiB */
+    DEFAULT_CACHE_SIZE_MB = 2
 };
 
@@ -242 +242 @@
 #endif
 
-static tr_bool
-getSpeedFromDict( tr_benc * dict, const char * key_in, int64_t * Bps )
-{
-    int64_t i;
-    char key[256];
-
-    /* 1. look for it ending in -Bps */
-    tr_snprintf( key, sizeof( key ), "%s-Bps", key_in );
-    if( tr_bencDictFindInt( dict, key, &i ) ) {
-        *Bps = i;
-        return TRUE;
-    }
-
-    /* 2. look for it an old entry without the -Bps suffix.
-          if found, interpret that to be either kB/s or KiB/s
-          based on the formatter settings in utils */
-    if( tr_bencDictFindInt( dict, key_in, &i ) ) {
-        *Bps = i * tr_formatter_speed_k( );
-        return TRUE;
-    }
-
-    return FALSE;
-}
-
 void
 tr_sessionGetDefaultSettings( const char * configDir UNUSED, tr_benc * d )
 {
-    const int speed_K = tr_formatter_speed_k( );
-
     assert( tr_bencIsDict( d ) );
 
     tr_bencDictReserve( d, 60 );
     tr_bencDictAddBool( d, TR_PREFS_KEY_BLOCKLIST_ENABLED,        FALSE );
-    tr_bencDictAddInt ( d, TR_PREFS_KEY_MAX_CACHE_SIZE,           DEFAULT_CACHE_SIZE_BYTES );
+    tr_bencDictAddInt ( d, TR_PREFS_KEY_MAX_CACHE_SIZE_MB,        DEFAULT_CACHE_SIZE_MB );
     tr_bencDictAddBool( d, TR_PREFS_KEY_DHT_ENABLED,              TRUE );
     tr_bencDictAddBool( d, TR_PREFS_KEY_LPD_ENABLED,              FALSE );
     tr_bencDictAddStr ( d, TR_PREFS_KEY_DOWNLOAD_DIR,             tr_getDefaultDownloadDir( ) );
-    tr_bencDictAddInt ( d, TR_PREFS_KEY_DSPEED_Bps,               100 * speed_K );
+    tr_bencDictAddInt ( d, TR_PREFS_KEY_DSPEED_KBps,              100 );
     tr_bencDictAddBool( d, TR_PREFS_KEY_DSPEED_ENABLED,           FALSE );
     tr_bencDictAddInt ( d, TR_PREFS_KEY_ENCRYPTION,               TR_DEFAULT_ENCRYPTION );
@@ -318 +292 @@
     tr_bencDictAddBool( d, TR_PREFS_KEY_SCRIPT_TORRENT_DONE_ENABLED, FALSE );
     tr_bencDictAddBool( d, TR_PREFS_KEY_ALT_SPEED_ENABLED,        FALSE );
-    tr_bencDictAddInt ( d, TR_PREFS_KEY_ALT_SPEED_UP_Bps,         50 * speed_K ); /* half the regular */
-    tr_bencDictAddInt ( d, TR_PREFS_KEY_ALT_SPEED_DOWN_Bps,       50 * speed_K ); /* half the regular */
+    tr_bencDictAddInt ( d, TR_PREFS_KEY_ALT_SPEED_UP_KBps,        50 ); /* half the regular */
+    tr_bencDictAddInt ( d, TR_PREFS_KEY_ALT_SPEED_DOWN_KBps,      50 ); /* half the regular */
     tr_bencDictAddInt ( d, TR_PREFS_KEY_ALT_SPEED_TIME_BEGIN,     540 ); /* 9am */
     tr_bencDictAddBool( d, TR_PREFS_KEY_ALT_SPEED_TIME_ENABLED,   FALSE );
     tr_bencDictAddInt ( d, TR_PREFS_KEY_ALT_SPEED_TIME_END,       1020 ); /* 5pm */
     tr_bencDictAddInt ( d, TR_PREFS_KEY_ALT_SPEED_TIME_DAY,       TR_SCHED_ALL );
-    tr_bencDictAddInt ( d, TR_PREFS_KEY_USPEED_Bps,               100 * speed_K );
+    tr_bencDictAddInt ( d, TR_PREFS_KEY_USPEED_KBps,              100 );
     tr_bencDictAddBool( d, TR_PREFS_KEY_USPEED_ENABLED,           FALSE );
     tr_bencDictAddInt ( d, TR_PREFS_KEY_UMASK,                    022 );
@@ -341 +315 @@
     tr_bencDictReserve( d, 60 );
     tr_bencDictAddBool( d, TR_PREFS_KEY_BLOCKLIST_ENABLED,        tr_blocklistIsEnabled( s ) );
-    tr_bencDictAddInt ( d, TR_PREFS_KEY_MAX_CACHE_SIZE,           tr_cacheGetLimit( s->cache ) );
+    tr_bencDictAddInt ( d, TR_PREFS_KEY_MAX_CACHE_SIZE_MB,        tr_cacheGetLimit( s->cache ) );
     tr_bencDictAddBool( d, TR_PREFS_KEY_DHT_ENABLED,              s->isDHTEnabled );
     tr_bencDictAddBool( d, TR_PREFS_KEY_LPD_ENABLED,              s->isLPDEnabled );
     tr_bencDictAddStr ( d, TR_PREFS_KEY_DOWNLOAD_DIR,             s->downloadDir );
-    tr_bencDictAddInt ( d, TR_PREFS_KEY_DSPEED_Bps,               tr_sessionGetSpeedLimit_Bps( s, TR_DOWN ) );
+    tr_bencDictAddInt ( d, TR_PREFS_KEY_DSPEED_KBps,              tr_sessionGetSpeedLimit_KBps( s, TR_DOWN ) );
     tr_bencDictAddBool( d, TR_PREFS_KEY_DSPEED_ENABLED,           tr_sessionIsSpeedLimited( s, TR_DOWN ) );
     tr_bencDictAddInt ( d, TR_PREFS_KEY_ENCRYPTION,               s->encryptionMode );
@@ -386 +360 @@
     tr_bencDictAddStr ( d, TR_PREFS_KEY_SCRIPT_TORRENT_DONE_FILENAME, tr_sessionGetTorrentDoneScript( s ) );
     tr_bencDictAddBool( d, TR_PREFS_KEY_ALT_SPEED_ENABLED,        tr_sessionUsesAltSpeed( s ) );
-    tr_bencDictAddInt ( d, TR_PREFS_KEY_ALT_SPEED_UP_Bps,         tr_sessionGetAltSpeed_Bps( s, TR_UP ) );
-    tr_bencDictAddInt ( d, TR_PREFS_KEY_ALT_SPEED_DOWN_Bps,       tr_sessionGetAltSpeed_Bps( s, TR_DOWN ) );
+    tr_bencDictAddInt ( d, TR_PREFS_KEY_ALT_SPEED_UP_KBps,         tr_sessionGetAltSpeed_KBps( s, TR_UP ) );
+    tr_bencDictAddInt ( d, TR_PREFS_KEY_ALT_SPEED_DOWN_KBps,       tr_sessionGetAltSpeed_KBps( s, TR_DOWN ) );
     tr_bencDictAddInt ( d, TR_PREFS_KEY_ALT_SPEED_TIME_BEGIN,     tr_sessionGetAltSpeedBegin( s ) );
     tr_bencDictAddBool( d, TR_PREFS_KEY_ALT_SPEED_TIME_ENABLED,   tr_sessionUsesAltSpeedTime( s ) );
     tr_bencDictAddInt ( d, TR_PREFS_KEY_ALT_SPEED_TIME_END,       tr_sessionGetAltSpeedEnd( s ) );
     tr_bencDictAddInt ( d, TR_PREFS_KEY_ALT_SPEED_TIME_DAY,       tr_sessionGetAltSpeedDay( s ) );
-    tr_bencDictAddInt ( d, TR_PREFS_KEY_USPEED_Bps,               tr_sessionGetSpeedLimit_Bps( s, TR_UP ) );
+    tr_bencDictAddInt ( d, TR_PREFS_KEY_USPEED_KBps,               tr_sessionGetSpeedLimit_KBps( s, TR_UP ) );
     tr_bencDictAddBool( d, TR_PREFS_KEY_USPEED_ENABLED,           tr_sessionIsSpeedLimited( s, TR_UP ) );
     tr_bencDictAddInt ( d, TR_PREFS_KEY_UMASK,                    s->umask );
@@ -539 +513 @@
     session->bandwidth = tr_bandwidthNew( session, NULL );
     session->lock = tr_lockNew( );
-    session->cache = tr_cacheNew( DEFAULT_CACHE_SIZE_BYTES );
+    session->cache = tr_cacheNew( 1024*1024*2 );
     session->tag = tr_strdup( tag );
     session->magicNumber = SESSION_MAGIC_NUMBER;
@@ -705 +679 @@
 
     /* misc features */
-    if( tr_bencDictFindInt( settings, TR_PREFS_KEY_MAX_CACHE_SIZE, &i ) )
-        tr_sessionSetCacheLimit( session, i );
+    if( tr_bencDictFindInt( settings, TR_PREFS_KEY_MAX_CACHE_SIZE_MB, &i ) )
+        tr_sessionSetCacheLimit_MB( session, i );
     if( tr_bencDictFindBool( settings, TR_PREFS_KEY_LAZY_BITFIELD, &boolVal ) )
         tr_sessionSetLazyBitfieldEnabled( session, boolVal );
@@ -806 +780 @@
         session->uploadSlotsPerTorrent = i;
 
-    if( getSpeedFromDict( settings, "speed-limit-up", &i ) )
-        tr_sessionSetSpeedLimit_Bps( session, TR_UP, i );
+    if( tr_bencDictFindInt( settings, TR_PREFS_KEY_USPEED_KBps, &i ) )
+        tr_sessionSetSpeedLimit_KBps( session, TR_UP, i );
     if( tr_bencDictFindBool( settings, TR_PREFS_KEY_USPEED_ENABLED, &boolVal ) )
         tr_sessionLimitSpeed( session, TR_UP, boolVal );
 
-    if( getSpeedFromDict( settings, "speed-limit-down", &i ) )
-        tr_sessionSetSpeedLimit_Bps( session, TR_DOWN, i );
+    if( tr_bencDictFindInt( settings, TR_PREFS_KEY_DSPEED_KBps, &i ) )
+        tr_sessionSetSpeedLimit_KBps( session, TR_DOWN, i );
     if( tr_bencDictFindBool( settings, TR_PREFS_KEY_DSPEED_ENABLED, &boolVal ) )
         tr_sessionLimitSpeed( session, TR_DOWN, boolVal );
@@ -826 +800 @@
 
     /* update the turtle mode's fields */
-    if( getSpeedFromDict( settings, "alt-speed-up", &i ) )
-        turtle->speedLimit_Bps[TR_UP] = i;
-    if( getSpeedFromDict( settings, "alt-speed-down", &i ) )
-        turtle->speedLimit_Bps[TR_DOWN] = i;
+    if( tr_bencDictFindInt( settings, TR_PREFS_KEY_ALT_SPEED_UP_KBps, &i ) )
+        turtle->speedLimit_Bps[TR_UP] = toSpeedBytes( i );
+    if( tr_bencDictFindInt( settings, TR_PREFS_KEY_ALT_SPEED_DOWN_KBps, &i ) )
+        turtle->speedLimit_Bps[TR_DOWN] = toSpeedBytes( i );
     if( tr_bencDictFindInt( settings, TR_PREFS_KEY_ALT_SPEED_TIME_BEGIN, &i ) )
         turtle->beginMinute = i;
@@ -1128 +1102 @@
 
 tr_bool
-tr_sessionGetActiveSpeedLimit_Bps( const tr_session * session, tr_direction dir, int * setme )
+tr_sessionGetActiveSpeedLimit_Bps( const tr_session * session, tr_direction dir, int * setme_Bps )
 {
     int isLimited = TRUE;
@@ -1136 +1110 @@
 
     if( tr_sessionUsesAltSpeed( session ) )
-        *setme = tr_sessionGetAltSpeed_Bps( session, dir );
+        *setme_Bps = tr_sessionGetAltSpeed_Bps( session, dir );
     else if( tr_sessionIsSpeedLimited( session, dir ) )
-        *setme = tr_sessionGetSpeedLimit_Bps( session, dir );
+        *setme_Bps = tr_sessionGetSpeedLimit_Bps( session, dir );
     else
         isLimited = FALSE;
 
     return isLimited;
+}
+tr_bool
+tr_sessionGetActiveSpeedLimit_KBps( const tr_session  * session,
+                                    tr_direction        dir,
+                                    double            * setme_KBps )
+{
+    int Bps;
+    const tr_bool is_active = tr_sessionGetActiveSpeedLimit_Bps( session, dir, &Bps );
+    *setme_KBps = toSpeedKBps( Bps );
+    return is_active;
 }
 
@@ -1305 +1289 @@
     updateBandwidth( s, d );
 }
+void
+tr_sessionSetSpeedLimit_KBps( tr_session * s, tr_direction d, int KBps )
+{
+    tr_sessionSetSpeedLimit_Bps( s, d, toSpeedBytes( KBps ) );
+}
 
 int
@@ -1313 +1302 @@
 
     return s->speedLimit_Bps[d];
+}
+int
+tr_sessionGetSpeedLimit_KBps( const tr_session * s, tr_direction d )
+{
+    return toSpeedKBps( tr_sessionGetSpeedLimit_Bps( s, d ) );
 }
 
@@ -1352 +1346 @@
 }
 
+void
+tr_sessionSetAltSpeed_KBps( tr_session * s, tr_direction d, int KBps )
+{
+    tr_sessionSetAltSpeed_Bps( s, d, toSpeedBytes( KBps ) );
+}
+
 int
 tr_sessionGetAltSpeed_Bps( const tr_session * s, tr_direction d )
@@ -1359 +1359 @@
 
     return s->turtle.speedLimit_Bps[d];
+}
+int
+tr_sessionGetAltSpeed_KBps( const tr_session * s, tr_direction d )
+{
+    return toSpeedKBps( tr_sessionGetAltSpeed_Bps( s, d ) );
 }
 
@@ -1567 +1572 @@
 tr_sessionGetPieceSpeed_Bps( const tr_session * session, tr_direction dir )
 {
-    return tr_isSession( session ) ? tr_bandwidthGetPieceSpeed_Bps( session->bandwidth, 0, dir ) : 0.0;
+    return tr_isSession( session ) ? tr_bandwidthGetPieceSpeed_Bps( session->bandwidth, 0, dir ) : 0;
+}
+double
+tr_sessionGetPieceSpeed_KBps( const tr_session * session, tr_direction dir )
+{
+    return toSpeedKBps( tr_sessionGetPieceSpeed_Bps( session, dir ) );
 }
 
@@ -1573 +1583 @@
 tr_sessionGetRawSpeed_Bps( const tr_session * session, tr_direction dir )
 {
-    return tr_isSession( session ) ? tr_bandwidthGetRawSpeed_Bps( session->bandwidth, 0, dir ) : 0.0;
-}
+    return tr_isSession( session ) ? tr_bandwidthGetRawSpeed_Bps( session->bandwidth, 0, dir ) : 0;
+}
+double
+tr_sessionGetRawSpeed_KBps( const tr_session * session, tr_direction dir )
+{
+    return toSpeedKBps( tr_sessionGetRawSpeed_Bps( session, dir ) );
+}
+
 
 int
@@ -1877 +1893 @@
 
 void
-tr_sessionSetCacheLimit( tr_session * session, int64_t max_bytes )
+tr_sessionSetCacheLimit_B( tr_session * session, uint64_t max_bytes )
 {
     assert( tr_isSession( session ) );
@@ -1883 +1899 @@
     tr_cacheSetLimit( session->cache, max_bytes );
 }
-
-int64_t
-tr_sessionGetCacheLimit( const tr_session * session )
+void
+tr_sessionSetCacheLimit_MB( tr_session * session, int MB )
+{
+    tr_sessionSetCacheLimit_B( session, toMemBytes( MB ) );
+}
+
+uint64_t
+tr_sessionGetCacheLimit_B( const tr_session * session )
 {
     assert( tr_isSession( session ) );
@@ -1891 +1912 @@
     return tr_cacheGetLimit( session->cache );
 }
+int
+tr_sessionGetCacheLimit_MB( const tr_session * session )
+{
+    return toMemMB( tr_sessionGetCacheLimit_B( session ) );
+}
+
 
 /***

trunk/libtransmission/session.h

@@ -30 +30 @@
 #include "bencode.h"
 #include "bitfield.h"
+#include "utils.h"
 
 typedef enum { TR_NET_OK, TR_NET_ERROR, TR_NET_WAIT } tr_tristate_t;
@@ -249 +250 @@
 }
 
+/***
+****
+***/
+
+static inline unsigned int toSpeedBytes ( unsigned int KBps ) { return KBps * tr_speed_K; }
+static inline double       toSpeedKBps  ( unsigned int Bps )  { return Bps / (double)tr_speed_K; }
+
+static inline uint64_t toMemBytes ( unsigned int MB ) { uint64_t B = tr_mem_K * tr_mem_K; B *= MB; return B; }
+static inline int      toMemMB    ( uint64_t B )      { return B / tr_mem_K; }
+
+/**
+**/
+
+void     tr_sessionSetCacheLimit_B ( tr_session * session, uint64_t B );
+uint64_t tr_sessionGetCacheLimit_B ( const tr_session * session );
+
+int  tr_sessionGetSpeedLimit_Bps( const tr_session *, tr_direction );
+int  tr_sessionGetAltSpeed_Bps  ( const tr_session *, tr_direction );
+int  tr_sessionGetRawSpeed_Bps  ( const tr_session *, tr_direction );
+int  tr_sessionGetPieceSpeed_Bps( const tr_session *, tr_direction );
+
+void tr_sessionSetSpeedLimit_Bps( tr_session *, tr_direction, int Bps );
+void tr_sessionSetAltSpeed_Bps  ( tr_session *, tr_direction, int Bps );
+
+tr_bool  tr_sessionGetActiveSpeedLimit_Bps( const tr_session  * session,
+                                            tr_direction        dir,
+                                            int               * setme );
+
+
 #endif

trunk/libtransmission/torrent.c

@@ -139 +139 @@
         tr_torrentSetDirty( tor );
 }
+void
+tr_torrentSetSpeedLimit_KBps( tr_torrent * tor, tr_direction dir, int KBps )
+{
+    tr_torrentSetSpeedLimit_Bps( tor, dir, toSpeedBytes( KBps ) );
+}
 
 int
@@ -147 +152 @@
 
     return tr_bandwidthGetDesiredSpeed_Bps( tor->bandwidth, dir );
+}
+int
+tr_torrentGetSpeedLimit_KBps( const tr_torrent * tor, tr_direction dir )
+{
+    return toSpeedKBps( tr_torrentGetSpeedLimit_Bps( tor, dir ) );
 }
 
@@ -969 +979 @@
     now = tr_date( );
     d = tr_peerMgrGetWebseedSpeed_Bps( tor, now );
-    s->rawUploadSpeed_Bps     = tr_bandwidthGetRawSpeed_Bps  ( tor->bandwidth, now, TR_UP );
-    s->pieceUploadSpeed_Bps   = tr_bandwidthGetPieceSpeed_Bps( tor->bandwidth, now, TR_UP );
-    s->rawDownloadSpeed_Bps   = d + tr_bandwidthGetRawSpeed_Bps  ( tor->bandwidth, now, TR_DOWN );
-    s->pieceDownloadSpeed_Bps = d + tr_bandwidthGetPieceSpeed_Bps( tor->bandwidth, now, TR_DOWN );
+    s->rawUploadSpeed_KBps     = toSpeedKBps( tr_bandwidthGetRawSpeed_Bps  ( tor->bandwidth, now, TR_UP ) );
+    s->pieceUploadSpeed_KBps   = toSpeedKBps( tr_bandwidthGetPieceSpeed_Bps( tor->bandwidth, now, TR_UP ) );
+    s->rawDownloadSpeed_KBps   = toSpeedKBps( d + tr_bandwidthGetRawSpeed_Bps  ( tor->bandwidth, now, TR_DOWN ) );
+    s->pieceDownloadSpeed_KBps = toSpeedKBps( d + tr_bandwidthGetPieceSpeed_Bps( tor->bandwidth, now, TR_DOWN ) );
 
     usableSeeds += tor->info.webseedCount;
@@ -1033 +1043 @@
         case TR_STATUS_DOWNLOAD:
             if( ( tor->etaDLSpeedCalculatedAt + 800 ) < now ) {
-                tor->etaDLSpeed_Bps = ( ( tor->etaDLSpeedCalculatedAt + 4000 ) < now )
-                    ? s->pieceDownloadSpeed_Bps /* if no recent previous speed, no need to smooth */
-                    : ((tor->etaDLSpeed_Bps*4) + s->pieceDownloadSpeed_Bps)/5; /* smooth across 5 readings */
+                tor->etaDLSpeed_KBps = ( ( tor->etaDLSpeedCalculatedAt + 4000 ) < now )
+                    ? s->pieceDownloadSpeed_KBps /* if no recent previous speed, no need to smooth */
+                    : ((tor->etaDLSpeed_KBps*4.0) + s->pieceDownloadSpeed_KBps)/5.0; /* smooth across 5 readings */
                 tor->etaDLSpeedCalculatedAt = now;
             }
@@ -1041 +1051 @@
             if( s->leftUntilDone > s->desiredAvailable )
                 s->eta = TR_ETA_NOT_AVAIL;
-            else if( s->pieceDownloadSpeed_Bps < 1 )
+            else if( tor->etaDLSpeed_KBps < 1 )
                 s->eta = TR_ETA_UNKNOWN;
             else
-                s->eta = s->leftUntilDone / tor->etaDLSpeed_Bps;
+                s->eta = s->leftUntilDone / toSpeedBytes(tor->etaDLSpeed_KBps);
             break;
 
@@ -1052 +1062 @@
             else {
                 if( ( tor->etaULSpeedCalculatedAt + 800 ) < now ) {
-                    tor->etaULSpeed_Bps = ( ( tor->etaULSpeedCalculatedAt + 4000 ) < now )
-                        ? s->pieceUploadSpeed_Bps /* if no recent previous speed, no need to smooth */
-                        : ((tor->etaULSpeed_Bps*4) + s->pieceUploadSpeed_Bps)/5; /* smooth across 5 readings */
+                    tor->etaULSpeed_KBps = ( ( tor->etaULSpeedCalculatedAt + 4000 ) < now )
+                        ? s->pieceUploadSpeed_KBps /* if no recent previous speed, no need to smooth */
+                        : ((tor->etaULSpeed_KBps*4.0) + s->pieceUploadSpeed_KBps)/5.0; /* smooth across 5 readings */
                     tor->etaULSpeedCalculatedAt = now;
                 }
-                if( s->pieceUploadSpeed_Bps < 1 )
+                if( tor->etaULSpeed_KBps < 1 )
                     s->eta = TR_ETA_UNKNOWN;
                 else
-                    s->eta = seedRatioBytesLeft / tor->etaULSpeed_Bps;
+                    s->eta = seedRatioBytesLeft / toSpeedBytes(tor->etaULSpeed_KBps);
             }
             break;
@@ -1194 +1204 @@
 ***/
 
-int*
-tr_torrentWebSpeeds_Bps( const tr_torrent * tor )
-{
-    return tr_isTorrent( tor ) ? tr_peerMgrWebSpeeds_Bps( tor ) : NULL;
+double*
+tr_torrentWebSpeeds_KBps( const tr_torrent * tor )
+{
+    return tr_isTorrent( tor ) ? tr_peerMgrWebSpeeds_KBps( tor ) : NULL;
 }
 

trunk/libtransmission/torrent.h

@@ -211 +211 @@
 
     uint64_t                   etaDLSpeedCalculatedAt;
-    int                        etaDLSpeed_Bps;
+    double                     etaDLSpeed_KBps;
     uint64_t                   etaULSpeedCalculatedAt;
-    int                        etaULSpeed_Bps;
+    double                     etaULSpeed_KBps;
 
     time_t                     addedDate;
@@ -422 +422 @@
 void tr_torrentGotNewInfoDict( tr_torrent * tor );
 
+void tr_torrentSetSpeedLimit_Bps  ( tr_torrent *, tr_direction, int Bps );
+int tr_torrentGetSpeedLimit_Bps  ( const tr_torrent *, tr_direction );
+
+
 #endif

trunk/libtransmission/transmission.h

@@ -157 +157 @@
 
 #define TR_PREFS_KEY_ALT_SPEED_ENABLED             "alt-speed-enabled"
-#define TR_PREFS_KEY_ALT_SPEED_UP_Bps              "alt-speed-up-Bps"
-#define TR_PREFS_KEY_ALT_SPEED_DOWN_Bps            "alt-speed-down-Bps"
+#define TR_PREFS_KEY_ALT_SPEED_UP_KBps             "alt-speed-up"
+#define TR_PREFS_KEY_ALT_SPEED_DOWN_KBps           "alt-speed-down"
 #define TR_PREFS_KEY_ALT_SPEED_TIME_BEGIN          "alt-speed-time-begin"
 #define TR_PREFS_KEY_ALT_SPEED_TIME_ENABLED        "alt-speed-time-enabled"
@@ -166 +166 @@
 #define TR_PREFS_KEY_BIND_ADDRESS_IPV6             "bind-address-ipv6"
 #define TR_PREFS_KEY_BLOCKLIST_ENABLED             "blocklist-enabled"
-#define TR_PREFS_KEY_MAX_CACHE_SIZE                "cache-size-bytes"
+#define TR_PREFS_KEY_MAX_CACHE_SIZE_MB             "cache-size-mb"
 #define TR_PREFS_KEY_DHT_ENABLED                   "dht-enabled"
 #define TR_PREFS_KEY_LPD_ENABLED                   "lpd-enabled"
@@ -207 +207 @@
 #define TR_PREFS_KEY_SCRIPT_TORRENT_DONE_ENABLED   "script-torrent-done-enabled"
 #define TR_PREFS_KEY_RPC_WHITELIST                 "rpc-whitelist"
-#define TR_PREFS_KEY_DSPEED_Bps                    "speed-limit-down-Bps"
+#define TR_PREFS_KEY_DSPEED_KBps                   "speed-limit-down"
 #define TR_PREFS_KEY_DSPEED_ENABLED                "speed-limit-down-enabled"
-#define TR_PREFS_KEY_USPEED_Bps                    "speed-limit-up-Bps"
+#define TR_PREFS_KEY_USPEED_KBps                   "speed-limit-up"
 #define TR_PREFS_KEY_USPEED_ENABLED                "speed-limit-up-enabled"
 #define TR_PREFS_KEY_UMASK                         "umask"
@@ -599 +599 @@
 void     tr_sessionSetLPDEnabled( tr_session * session, tr_bool enabled );
 
-void     tr_sessionSetCacheLimit( tr_session * session, int64_t bytes );
-int64_t  tr_sessionGetCacheLimit( const tr_session * session );
+void     tr_sessionSetCacheLimit_MB( tr_session * session, int mb );
+int      tr_sessionGetCacheLimit_MB( const tr_session * session );
 
 void     tr_sessionSetLazyBitfieldEnabled( tr_session * session, tr_bool enabled );
@@ -658 +658 @@
 ***/
 
-void tr_sessionSetSpeedLimit_Bps( tr_session *, tr_direction, int Bps );
-int tr_sessionGetSpeedLimit_Bps( const tr_session *, tr_direction );
+void tr_sessionSetSpeedLimit_KBps( tr_session *, tr_direction, int Bps );
+int tr_sessionGetSpeedLimit_KBps( const tr_session *, tr_direction );
 
 void     tr_sessionLimitSpeed         ( tr_session *, tr_direction, tr_bool );
@@ -669 +669 @@
 ***/
 
-void tr_sessionSetAltSpeed_Bps( tr_session *, tr_direction, int Bps );
-int  tr_sessionGetAltSpeed_Bps( const tr_session *, tr_direction );
+void tr_sessionSetAltSpeed_KBps( tr_session *, tr_direction, int Bps );
+int  tr_sessionGetAltSpeed_KBps( const tr_session *, tr_direction );
 
 void     tr_sessionUseAltSpeed        ( tr_session *, tr_bool );
@@ -707 +707 @@
 
 
-tr_bool  tr_sessionGetActiveSpeedLimit_Bps( const tr_session  * session,
-                                            tr_direction        dir,
-                                            int               * setme );
+tr_bool  tr_sessionGetActiveSpeedLimit_KBps( const tr_session  * session,
+                                             tr_direction        dir,
+                                             double            * setme );
 
 /***
@@ -715 +715 @@
 ***/
 
-int        tr_sessionGetRawSpeed_Bps  ( const tr_session *, tr_direction );
-int        tr_sessionGetPieceSpeed_Bps( const tr_session *, tr_direction );
+double     tr_sessionGetRawSpeed_KBps  ( const tr_session *, tr_direction );
+double     tr_sessionGetPieceSpeed_KBps( const tr_session *, tr_direction );
 
 void       tr_sessionSetRatioLimited  ( tr_session *, tr_bool isLimited );
@@ -1125 +1125 @@
 ***/
 
-void     tr_torrentSetSpeedLimit_Bps  ( tr_torrent *, tr_direction, int KB_s );
-int      tr_torrentGetSpeedLimit_Bps  ( const tr_torrent *, tr_direction );
+void     tr_torrentSetSpeedLimit_KBps  ( tr_torrent *, tr_direction, int KBps );
+int      tr_torrentGetSpeedLimit_KBps  ( const tr_torrent *, tr_direction );
 
 void     tr_torrentUseSpeedLimit      ( tr_torrent *, tr_direction, tr_bool );
@@ -1381 +1381 @@
 
     float    progress;
-    int      rateToPeer_Bps;
-    int      rateToClient_Bps;
+    double   rateToPeer_KBps;
+    double   rateToClient_KBps;
 
 
@@ -1545 +1545 @@
  *         NOTE: always free this array with tr_free() when you're done with it.
  */
-int*  tr_torrentWebSpeeds_Bps( const tr_torrent * torrent );
+double*  tr_torrentWebSpeeds_KBps( const tr_torrent * torrent );
 
 typedef struct tr_file_stat
@@ -1747 +1747 @@
     /** Speed all data being sent for this torrent.
         This includes piece data, protocol messages, and TCP overhead */
-    int rawUploadSpeed_Bps;
+    double rawUploadSpeed_KBps;
 
     /** Speed all data being received for this torrent.
         This includes piece data, protocol messages, and TCP overhead */
-    int rawDownloadSpeed_Bps;
+    double rawDownloadSpeed_KBps;
 
     /** Speed all piece being sent for this torrent.
         This ONLY counts piece data. */
-    int pieceUploadSpeed_Bps;
+    double pieceUploadSpeed_KBps;
 
     /** Speed all piece being received for this torrent.
         This ONLY counts piece data. */
-    int pieceDownloadSpeed_Bps;
+    double pieceDownloadSpeed_KBps;
 
 #define TR_ETA_NOT_AVAIL -1

trunk/libtransmission/utils.c

@@ -1583 +1583 @@
 
 char*
-tr_formatter_size( char * buf, uint64_t bytes, size_t buflen )
+tr_formatter_size_B( char * buf, uint64_t bytes, size_t buflen )
 {
     return formatter_get_size_str( &size_units, buf, bytes, buflen );
@@ -1589 +1589 @@
 
 static struct formatter_units speed_units;
+
+unsigned int tr_speed_K = 0u;
 
 void
@@ -1595 +1597 @@
                          const char * mb, const char * gb )
 {
+    tr_speed_K = kilo;
     formatter_init( &speed_units, kilo, b, kb, mb, gb );
 }
 
 char*
-tr_formatter_speed( char * buf, uint64_t bytes_per_second, size_t buflen )
-{
-    return formatter_get_size_str( &speed_units, buf, bytes_per_second, buflen );
-}
-
-unsigned int
-tr_formatter_speed_k( void )
-{
-    return speed_units.units[TR_FMT_KB].value;
+tr_formatter_speed_Bps( char * buf, uint64_t bytes_per_second, size_t buflen )
+{
+    formatter_get_size_str( &speed_units, buf, bytes_per_second, buflen );
+    return buf;
 }
 
 static struct formatter_units mem_units;
 
+unsigned int tr_mem_K = 0u;
+ 
 void
 tr_formatter_mem_init( unsigned int kilo,
@@ -1617 +1617 @@
                        const char * mb, const char * gb )
 {
+    tr_mem_K = kilo;
     formatter_init( &mem_units, kilo, b, kb, mb, gb );
 }
 
 char*
-tr_formatter_mem( char * buf, uint64_t bytes_per_second, size_t buflen )
+tr_formatter_mem_B( char * buf, uint64_t bytes_per_second, size_t buflen )
 {
     return formatter_get_size_str( &mem_units, buf, bytes_per_second, buflen );

trunk/libtransmission/utils.h

@@ -575 +575 @@
 
 /* format a speed into a user-readable string. */
-char* tr_formatter_speed( char * buf, uint64_t bytes_per_second, size_t buflen );
+extern unsigned int tr_speed_K;
+char* tr_formatter_speed_Bps( char * buf, uint64_t Bps, size_t buflen );
+static inline char* tr_formatter_speed_KBps( char * buf, double KBps, size_t buflen ) { return tr_formatter_speed_Bps( buf, KBps * tr_speed_K, buflen ); }
+static inline char* tr_formatter_speed_MBps( char * buf, double MBps, size_t buflen ) { return tr_formatter_speed_Bps( buf, MBps * tr_speed_K * tr_speed_K, buflen ); }
+static inline char* tr_formatter_speed_GBps( char * buf, double GBps, size_t buflen ) { return tr_formatter_speed_Bps( buf, GBps * tr_speed_K * tr_speed_K * tr_speed_K, buflen ); }
+
+/* format a memory size into a user-readable string. */
+extern unsigned int tr_mem_K;
+char* tr_formatter_mem_B( char * buf, uint64_t bytes, size_t buflen );
+static inline char* tr_formatter_mem_KB( char * buf, double KBps, size_t buflen ) { return tr_formatter_mem_B( buf, KBps * tr_mem_K, buflen ); }
+static inline char* tr_formatter_mem_MB( char * buf, double MBps, size_t buflen ) { return tr_formatter_mem_B( buf, MBps * tr_mem_K * tr_mem_K, buflen ); }
+static inline char* tr_formatter_mem_GB( char * buf, double GBps, size_t buflen ) { return tr_formatter_mem_B( buf, GBps * tr_mem_K * tr_mem_K * tr_mem_K, buflen ); }
 
 /* format a file size into a user-readable string. */
-char* tr_formatter_size( char * buf, uint64_t bytes, size_t buflen );
-
-/* format a memory size into a user-readable string. */
-char* tr_formatter_mem( char * buf, uint64_t bytes, size_t buflen );
-
-unsigned int tr_formatter_speed_k( void );
+extern unsigned int tr_size_K;
+char* tr_formatter_size_B( char * buf, uint64_t bytes, size_t buflen );
+static inline char* tr_formatter_size_KB( char * buf, double KBps, size_t buflen ) { return tr_formatter_size_B( buf, KBps * tr_size_K, buflen ); }
+static inline char* tr_formatter_size_MB( char * buf, double MBps, size_t buflen ) { return tr_formatter_size_B( buf, MBps * tr_size_K * tr_size_K, buflen ); }
+static inline char* tr_formatter_size_GB( char * buf, double GBps, size_t buflen ) { return tr_formatter_size_B( buf, GBps * tr_size_K * tr_size_K * tr_size_K, buflen ); }
 
 

trunk/qt/formatter.cc

@@ -45 +45 @@
 ***/
 
+Speed
+Speed :: fromKBps( double KBps )
+{
+    return KBps * Formatter::speed_K;
+}
+
+/***
+****
+***/
+
 QString
 Formatter :: memToString( double bytes )
@@ -52 +62 @@
     else {
         char buf[128];
-        tr_formatter_mem( buf, bytes, sizeof( buf ) );
+        tr_formatter_mem_B( buf, bytes, sizeof( buf ) );
         return buf;
     }
@@ -64 +74 @@
     else {
         char buf[128];
-        tr_formatter_size( buf, bytes, sizeof( buf ) );
+        tr_formatter_size_B( buf, bytes, sizeof( buf ) );
         return buf;
     }
@@ -76 +86 @@
     else {
         char buf[128];
-        tr_formatter_speed( buf, speed.Bps( ), sizeof( buf ) );
+        tr_formatter_speed_KBps( buf, speed.Bps( ), sizeof( buf ) );
         return buf;
     }

trunk/qt/mainwin.cc

@@ -550 +550 @@
         g->addAction( a );
         connect( a, SIGNAL(triggered(bool)), this, SLOT(onSetPrefs(bool)) );
-        a = myDlimitOnAction = sub->addAction( tr( "Limited at %1" ).arg( Formatter::speedToString( Speed::fromBps( currentVal ) ) ) );
+        a = myDlimitOnAction = sub->addAction( tr( "Limited at %1" ).arg( Formatter::speedToString( Speed::fromKBps( currentVal ) ) ) );
         a->setCheckable( true );
         a->setProperty( PREF_VARIANTS_KEY, QVariantList() << Prefs::DSPEED << currentVal << Prefs::DSPEED_ENABLED << true );
@@ -557 +557 @@
         sub->addSeparator( );
         foreach( int i, stockSpeeds ) {
-            const int Bps = i * Formatter::speed_K;
-            a = sub->addAction( Formatter::speedToString( Speed::fromBps( Bps ) ) );
-            a->setProperty( PREF_VARIANTS_KEY, QVariantList() << Prefs::DSPEED << Bps << Prefs::DSPEED_ENABLED << true );
+            a = sub->addAction( Formatter::speedToString( Speed::fromKBps( i ) ) );
+            a->setProperty( PREF_VARIANTS_KEY, QVariantList() << Prefs::DSPEED << i << Prefs::DSPEED_ENABLED << true );
             connect( a, SIGNAL(triggered(bool)), this, SLOT(onSetPrefs()));
         }
@@ -571 +570 @@
         g->addAction( a );
         connect( a, SIGNAL(triggered(bool)), this, SLOT(onSetPrefs(bool)) );
-        a = myUlimitOnAction = sub->addAction( tr( "Limited at %1" ).arg( Formatter::speedToString( Speed::fromBps( currentVal ) ) ) );
+        a = myUlimitOnAction = sub->addAction( tr( "Limited at %1" ).arg( Formatter::speedToString( Speed::fromKBps( currentVal ) ) ) );
         a->setCheckable( true );
         a->setProperty( PREF_VARIANTS_KEY, QVariantList() << Prefs::USPEED << currentVal << Prefs::USPEED_ENABLED << true );
@@ -578 +577 @@
         sub->addSeparator( );
         foreach( int i, stockSpeeds ) {
-            const int Bps = i * Formatter::speed_K;
-            a = sub->addAction( Formatter::speedToString( Speed::fromBps( Bps ) ) );
-            a->setProperty( PREF_VARIANTS_KEY, QVariantList() << Prefs::USPEED << Bps << Prefs::USPEED_ENABLED << true );
+            a = sub->addAction( Formatter::speedToString( Speed::fromKBps( i ) ) );
+            a->setProperty( PREF_VARIANTS_KEY, QVariantList() << Prefs::USPEED << i << Prefs::USPEED_ENABLED << true );
             connect( a, SIGNAL(triggered(bool)), this, SLOT(onSetPrefs()));
         }
@@ -1014 +1012 @@
 
         case Prefs::DSPEED:
-            myDlimitOnAction->setText( tr( "Limited at %1" ).arg( Formatter::speedToString( Speed::fromBps( myPrefs.get<int>(key) ) ) ) );
+            myDlimitOnAction->setText( tr( "Limited at %1" ).arg( Formatter::speedToString( Speed::fromKBps( myPrefs.get<int>(key) ) ) ) );
             break;
 
@@ -1022 +1020 @@
 
         case Prefs::USPEED:
-            myUlimitOnAction->setText( tr( "Limited at %1" ).arg( Formatter::speedToString( Speed::fromBps( myPrefs.get<int>(key) ) ) ) );
+            myUlimitOnAction->setText( tr( "Limited at %1" ).arg( Formatter::speedToString( Speed::fromKBps( myPrefs.get<int>(key) ) ) ) );
             break;
 
@@ -1088 +1086 @@
             const QString fmt = b ? tr( "Click to disable Temporary Speed Limits\n(%1 down, %2 up)" )
                                   : tr( "Click to enable Temporary Speed Limits\n(%1 down, %2 up)" );
-            const Speed d = Speed::fromBps( myPrefs.getInt( Prefs::ALT_SPEED_LIMIT_DOWN ) );
-            const Speed u = Speed::fromBps( myPrefs.getInt( Prefs::ALT_SPEED_LIMIT_UP ) );
+            const Speed d = Speed::fromKBps( myPrefs.getInt( Prefs::ALT_SPEED_LIMIT_DOWN ) );
+            const Speed u = Speed::fromKBps( myPrefs.getInt( Prefs::ALT_SPEED_LIMIT_UP ) );
             myAltSpeedButton->setToolTip( fmt.arg( Formatter::speedToString( d ) )
                                              .arg( Formatter::speedToString( u ) ) );

trunk/qt/prefs-dialog.cc

@@ -52 +52 @@
 {
     const char * PREF_KEY( "pref-key" );
-    const char * MULTIPLIER_KEY( "multiplier-key" );
 };
 
@@ -85 +84 @@
     const QObject * spin( sender()->property( "SPIN" ).value<QObject*>( ) );
     const int key = spin->property( PREF_KEY ).toInt( );
-    const int multiplier = spin->property( MULTIPLIER_KEY ).toInt( );
 
     const QDoubleSpinBox * d = qobject_cast<const QDoubleSpinBox*>( spin );
     if( d != 0 )
-        myPrefs.set( key, multiplier * d->value( ) );
+        myPrefs.set( key, d->value( ) );
     else
-        myPrefs.set( key, multiplier * qobject_cast<const QSpinBox*>(spin)->value( ) );
+        myPrefs.set( key, qobject_cast<const QSpinBox*>(spin)->value( ) );
 }
 
@@ -117 +115 @@
 
 QSpinBox *
-PrefsDialog :: spinBoxNew( int key, int low, int high, int step, int multiplier )
+PrefsDialog :: spinBoxNew( int key, int low, int high, int step )
 {
     QSpinBox * spin = new QSpinBox( );
     spin->setRange( low, high );
     spin->setSingleStep( step );
-    spin->setValue( myPrefs.getInt( key ) / multiplier );
+    spin->setValue( myPrefs.getInt( key ) );
     spin->setProperty( PREF_KEY, key );
-    spin->setProperty( MULTIPLIER_KEY, multiplier );
     connect( spin, SIGNAL(valueChanged(int)), this, SLOT(spinBoxChanged(int)));
     myWidgets.insert( key, spin );
@@ -139 +136 @@
 
 QDoubleSpinBox *
-PrefsDialog :: doubleSpinBoxNew( int key, double low, double high, double step, int decimals, int multiplier )
+PrefsDialog :: doubleSpinBoxNew( int key, double low, double high, double step, int decimals )
 {
     QDoubleSpinBox * spin = new QDoubleSpinBox( );
@@ -145 +142 @@
     spin->setSingleStep( step );
     spin->setDecimals( decimals );
-    spin->setValue( myPrefs.getDouble( key ) / multiplier );
     spin->setProperty( PREF_KEY, key );
-    spin->setProperty( MULTIPLIER_KEY, multiplier );
     connect( spin, SIGNAL(valueChanged(double)), this, SLOT(doubleSpinBoxChanged(double)));
     myWidgets.insert( key, spin );
@@ -274 +269 @@
 
         l = checkBoxNew( tr( "Limit &download speed (%1):" ).arg( Formatter::speed_K_str ), Prefs::DSPEED_ENABLED );
-        r = spinBoxNew( Prefs::DSPEED, 0, INT_MAX, 5, Formatter::speed_K );
+        r = spinBoxNew( Prefs::DSPEED, 0, INT_MAX, 5 );
         hig->addRow( l, r );
         enableBuddyWhenChecked( qobject_cast<QCheckBox*>(l), r );
 
         l = checkBoxNew( tr( "Limit &upload speed (%1):" ).arg( Formatter::speed_K_str ), Prefs::USPEED_ENABLED );
-        r = spinBoxNew( Prefs::USPEED, 0, INT_MAX, 5, Formatter::speed_K );
+        r = spinBoxNew( Prefs::USPEED, 0, INT_MAX, 5 );
         hig->addRow( l, r );
         enableBuddyWhenChecked( qobject_cast<QCheckBox*>(l), r );
@@ -300 +295 @@
 
         s = tr( "Limit d&ownload speed (%1):" ).arg( Formatter::speed_K_str );
-        r = spinBoxNew( Prefs :: ALT_SPEED_LIMIT_DOWN, 0, INT_MAX, 5, Formatter::speed_K );
+        r = spinBoxNew( Prefs :: ALT_SPEED_LIMIT_DOWN, 0, INT_MAX, 5 );
         hig->addRow( s, r );
 
         s = tr( "Limit u&pload speed (%1):" ).arg( Formatter::speed_K_str );
-        r = spinBoxNew( Prefs :: ALT_SPEED_LIMIT_UP, 0, INT_MAX, 5, Formatter::speed_K );
+        r = spinBoxNew( Prefs :: ALT_SPEED_LIMIT_UP, 0, INT_MAX, 5 );
         hig->addRow( s, r );
 

trunk/qt/prefs-dialog.h

@@ -65 +65 @@
 
     private:
-        QDoubleSpinBox * doubleSpinBoxNew( int key, double low, double high, double step, int decimals, int multiplier=1 );
+        QDoubleSpinBox * doubleSpinBoxNew( int key, double low, double high, double step, int decimals );
         QCheckBox * checkBoxNew( const QString& text, int key );
-        QSpinBox * spinBoxNew( int key, int low, int high, int step, int multiplier=1 );
+        QSpinBox * spinBoxNew( int key, int low, int high, int step );
         QTimeEdit * timeEditNew( int key );
         QLineEdit * lineEditNew( int key, int mode = 0 );

trunk/qt/prefs.cc

@@ -65 +65 @@
 
     /* libtransmission settings */
-    { ALT_SPEED_LIMIT_UP, TR_PREFS_KEY_ALT_SPEED_UP_Bps, QVariant::Int },
-    { ALT_SPEED_LIMIT_DOWN, TR_PREFS_KEY_ALT_SPEED_DOWN_Bps, QVariant::Int },
+    { ALT_SPEED_LIMIT_UP, TR_PREFS_KEY_ALT_SPEED_UP_KBps, QVariant::Int },
+    { ALT_SPEED_LIMIT_DOWN, TR_PREFS_KEY_ALT_SPEED_DOWN_KBps, QVariant::Int },
     { ALT_SPEED_LIMIT_ENABLED, TR_PREFS_KEY_ALT_SPEED_ENABLED, QVariant::Bool },
     { ALT_SPEED_LIMIT_TIME_BEGIN, TR_PREFS_KEY_ALT_SPEED_TIME_BEGIN, QVariant::Int },
@@ -73 +73 @@
     { ALT_SPEED_LIMIT_TIME_DAY, TR_PREFS_KEY_ALT_SPEED_TIME_DAY, QVariant::Int },
     { BLOCKLIST_ENABLED, TR_PREFS_KEY_BLOCKLIST_ENABLED, QVariant::Bool },
-    { DSPEED, TR_PREFS_KEY_DSPEED_Bps, QVariant::Int },
+    { DSPEED, TR_PREFS_KEY_DSPEED_KBps, QVariant::Int },
     { DSPEED_ENABLED, TR_PREFS_KEY_DSPEED_ENABLED, QVariant::Bool },
     { DOWNLOAD_DIR, TR_PREFS_KEY_DOWNLOAD_DIR, QVariant::String },
@@ -116 +116 @@
     { RPC_WHITELIST, TR_PREFS_KEY_RPC_WHITELIST, QVariant::String },
     { USPEED_ENABLED, TR_PREFS_KEY_USPEED_ENABLED, QVariant::Bool },
-    { USPEED, TR_PREFS_KEY_USPEED_Bps, QVariant::Int },
+    { USPEED, TR_PREFS_KEY_USPEED_KBps, QVariant::Int },
     { UPLOAD_SLOTS_PER_TORRENT, TR_PREFS_KEY_UPLOAD_SLOTS_PER_TORRENT, QVariant::Int }
 };

trunk/qt/session.h

@@ -23 +23 @@
 
 #include <libtransmission/transmission.h>
-
-#include "speed.h"
 
 extern "C"

trunk/qt/speed.h

@@ -24 +24 @@
         int Bps( ) const { return _Bps; }
         bool isZero( ) const { return _Bps == 0; }
-        static Speed fromKiBps( double KiBps ) { return Speed( KiBps*1024 ); }
+        static Speed fromKBps( double KBps );
         static Speed fromBps( int Bps ) { return Speed( Bps ); }
         void setKiBps( double KiBps ) { setBps( KiBps*1024 ); }

trunk/qt/torrent.cc

@@ -54 +54 @@
 {
     { ID, "id", QVariant::Int, INFO, },
-    { UPLOAD_SPEED, "rateUpload", QVariant::Int, STAT } /* B/s */,
-    { DOWNLOAD_SPEED, "rateDownload", QVariant::Int, STAT }, /* B/s */
+    { UPLOAD_SPEED, "rateUpload", QVariant::Double, STAT } /* KBps */,
+    { DOWNLOAD_SPEED, "rateDownload", QVariant::Double, STAT }, /* KBps */
     { DOWNLOAD_DIR, "downloadDir", QVariant::String, STAT },
     { ACTIVITY, "status", QVariant::Int, STAT },
@@ -90 +90 @@
     { SEED_RATIO_LIMIT, "seedRatioLimit", QVariant::Double, STAT },
     { SEED_RATIO_MODE, "seedRatioMode", QVariant::Int, STAT },
-    { DOWN_LIMIT, "downloadLimit", QVariant::Int, STAT_EXTRA }, /* KiB/s */
+    { DOWN_LIMIT, "downloadLimit", QVariant::Int, STAT_EXTRA }, /* KB/s */
     { DOWN_LIMITED, "downloadLimited", QVariant::Bool, STAT_EXTRA },
-    { UP_LIMIT, "uploadLimit", QVariant::Int, STAT_EXTRA }, /* KiB/s */
+    { UP_LIMIT, "uploadLimit", QVariant::Int, STAT_EXTRA }, /* KB/s */
     { UP_LIMITED, "uploadLimited", QVariant::Bool, STAT_EXTRA },
     { HONORS_SESSION_LIMITS, "honorsSessionLimits", QVariant::Bool, STAT_EXTRA },
@@ -654 +654 @@
             if( tr_bencDictFindReal( child, "progress", &d ) )
                 peer.progress = d;
-            if( tr_bencDictFindInt( child, "rateToClient", &i ) )
-                peer.rateToClient = Speed::fromBps( i );
-            if( tr_bencDictFindInt( child, "rateToPeer", &i ) )
-                peer.rateToPeer = Speed::fromBps( i );
+            if( tr_bencDictFindReal( child, "rateToClient", &d ) )
+                peer.rateToClient = Speed::fromKBps( d );
+            if( tr_bencDictFindReal( child, "rateToPeer", &d ) )
+                peer.rateToPeer = Speed::fromKBps( d );
             peerList << peer;
         }

trunk/qt/torrent.h

@@ -280 +280 @@
         int connectedPeers( ) const { return getInt( PEERS_CONNECTED ); }
         int connectedPeersAndWebseeds( ) const { return connectedPeers( ) + getInt( WEBSEEDS_SENDING_TO_US ); }
-        Speed downloadSpeed( ) const { return Speed::fromBps( getInt( DOWNLOAD_SPEED ) ); }
-        Speed uploadSpeed( ) const { return Speed::fromBps( getInt( UPLOAD_SPEED ) ); }
+        Speed downloadSpeed( ) const { return Speed::fromKBps( getDouble( DOWNLOAD_SPEED ) ); }
+        Speed uploadSpeed( ) const { return Speed::fromKBps( getDouble( UPLOAD_SPEED ) ); }
         double getVerifyProgress( ) const { return getDouble( PERCENT_VERIFIED ); }
         bool hasFileSubstring( const QString& substr ) const;
         bool hasTrackerSubstring( const QString& substr ) const;
-        Speed uploadLimit( ) const { return Speed::fromBps( getInt( UP_LIMIT ) ); }
-        Speed downloadLimit( ) const { return Speed::fromBps( getInt( DOWN_LIMIT ) ); }
+        Speed uploadLimit( ) const { return Speed::fromKBps( getInt( UP_LIMIT ) ); }
+        Speed downloadLimit( ) const { return Speed::fromKBps( getInt( DOWN_LIMIT ) ); }
         bool uploadIsLimited( ) const { return getBool( UP_LIMITED ); }
         bool downloadIsLimited( ) const { return getBool( DOWN_LIMITED ); }

trunk/utils/show.c

@@ -105 +105 @@
         printf( "  Comment: %s\n", inf->comment );
     printf( "  Piece Count: %d\n", inf->pieceCount );
-    printf( "  Piece Size: %s\n", tr_formatter_mem( buf, inf->pieceSize, sizeof( buf ) ) );
-    printf( "  Total Size: %s\n", tr_formatter_size( buf, inf->totalSize, sizeof( buf ) ) );
+    printf( "  Piece Size: %s\n", tr_formatter_mem_B( buf, inf->pieceSize, sizeof( buf ) ) );
+    printf( "  Total Size: %s\n", tr_formatter_size_B( buf, inf->totalSize, sizeof( buf ) ) );
     printf( "  Privacy: %s\n", inf->isPrivate ? "Private torrent" : "Public torrent" );
 
@@ -131 +131 @@
     printf( "\nFILES\n\n" );
     for( i=0; i<(int)inf->fileCount; ++i )
-        printf( "  %s (%s)\n", inf->files[i].name, tr_formatter_size( buf, inf->files[i].length, sizeof( buf ) ) );
+        printf( "  %s (%s)\n", inf->files[i].name, tr_formatter_size_B( buf, inf->files[i].length, sizeof( buf ) ) );
 }