Changeset 2357

Timestamp:

Jul 15, 2007, 5:25:06 PM (15 years ago)

Author:

livings124

Message:

use peersConnected instead of peersTotal

Location:

trunk/macosx

Files:

• InfoWindowController.m (modified) (1 diff)
• Torrent.h (modified) (1 diff)
• Torrent.m (modified) (5 diffs)

trunk/macosx/InfoWindowController.m

@@ -404 +404 @@
     if (active)
     {
-        int total = [torrent totalPeers];
+        int total = [torrent totalPeersConnected];
         NSString * connected = [NSString stringWithFormat:
                                 NSLocalizedString(@"%d Connected", "Inspector -> Peers tab -> peers"), total];

trunk/macosx/Torrent.h

@@ -178 +178 @@
 - (int) completedFromTracker;
 
-- (int) totalPeers;
+- (int) totalPeersConnected;
 - (int) totalPeersTracker;
 - (int) totalPeersIncoming;

trunk/macosx/Torrent.m

@@ -380 +380 @@
         case TR_STATUS_DOWNLOAD:
             [statusString setString: @""];
-            if ([self totalPeers] != 1)
+            if ([self totalPeersConnected] != 1)
                 [statusString appendFormat: NSLocalizedString(@"Downloading from %d of %d peers",
-                                                "Torrent -> status string"), [self peersUploading], [self totalPeers]];
+                                                "Torrent -> status string"), [self peersUploading], [self totalPeersConnected]];
             else
                 [statusString appendFormat: NSLocalizedString(@"Downloading from %d of 1 peer",
@@ -423 +423 @@
         case TR_STATUS_DONE:
             [statusString setString: @""];
-            if ([self totalPeers] != 1)
+            if ([self totalPeersConnected] != 1)
                 [statusString appendFormat: NSLocalizedString(@"Seeding to %d of %d peers", "Torrent -> status string"),
-                                                [self peersDownloading], [self totalPeers]];
+                                                [self peersDownloading], [self totalPeersConnected]];
             else
                 [statusString appendFormat: NSLocalizedString(@"Seeding to %d of 1 peer", "Torrent -> status string"),
@@ -1108 +1108 @@
 {
     int totalPeers, i;
-    tr_peer_stat_t * peers = tr_torrentPeers(fHandle, & totalPeers);
+    tr_peer_stat_t * peers = tr_torrentPeers(fHandle, &totalPeers);
     
     NSMutableArray * peerDics = [NSMutableArray arrayWithCapacity: totalPeers];
@@ -1181 +1181 @@
 }
 
-- (int) totalPeers
-{
-    return fStat->peersTotal;
+- (int) totalPeersConnected
+{
+    return fStat->peersConnected;
 }
 
@@ -1780 +1780 @@
     //determine percentage finished and available
     int have = rintf((float)MAX_PIECES * [self progress]), avail;
-    if ([self progress] >= 1.0 || ![self isActive] || [self totalPeers] <= 0)
+    if ([self progress] >= 1.0 || ![self isActive] || [self totalPeersConnected] <= 0)
         avail = 0;
     else