Changeset 9403

Timestamp:

Oct 25, 2009, 6:45:35 PM (13 years ago)

Author:

livings124

Message:

since the Mac UI is the only one to use it, move percentRatio calculation into the Mac code

Location:

trunk

Files:

• libtransmission/torrent.c (modified) (1 diff)
• libtransmission/transmission.h (modified) (1 diff)
• macosx/Torrent.m (modified) (1 diff)

trunk/libtransmission/torrent.c

@@ -1025 +1025 @@
     }
 
-    if( !checkSeedRatio || s->ratio >= seedRatio || s->ratio == TR_RATIO_INF )
-        s->percentRatio = 1.0;
-    else if( s->ratio == TR_RATIO_NA )
-        s->percentRatio = 0.0;
-    else
-        s->percentRatio = s->ratio / seedRatio;
-
     tr_torrentUnlock( tor );
 

trunk/libtransmission/transmission.h

@@ -1629 +1629 @@
     float    percentDone;
 
-    /** The percentage of the actual ratio to the seed ratio.  This will be
-        equal to 1 if the ratio is reached or the torrent is set to seed forever.
-        Range is [0..1] */
-    float    percentRatio;
-
     /** Speed all data being sent for this torrent. (KiB/s)
         This includes piece data, protocol messages, and TCP overhead */

trunk/macosx/Torrent.m

@@ -344 +344 @@
 - (CGFloat) progressStopRatio
 {
-    return fStat->percentRatio;
+    double seedRatio;
+    if (!tr_torrentGetSeedRatio(fHandle, seedRatio) || [self ratio] >= seedRatio || [self ratio] == TR_RATIO_INF)
+        return 1.0;
+    else if ([self ratio] == TR_RATIO_NA)
+        return 0.0;
+    else
+        return [self ratio] / seedRatio;
 }