Changeset 10948

Timestamp:

Jul 6, 2010, 3:31:17 AM (12 years ago)

Author:

livings124

Message:

Mac build compiles again

Location:

trunk

Files:

• NEWS (modified) (1 diff)
• libtransmission/transmission.h (modified) (1 diff)
• macosx/Badger.m (modified) (1 diff)
• macosx/Controller.m (modified) (4 diffs)
• macosx/PrefsController.m (modified) (5 diffs)
• macosx/Torrent.m (modified) (4 diffs)

trunk/NEWS

@@ -6 +6 @@
   * Better parsing of nonstandard magnet links
 ==== Mac ====
-  * If the seed ratio is already met when download completes, still show the Growl notification and download-complete sound
+  * If the seed ratio is already met when download completes, still perform the Growl notification and download-complete sound
   * Fix the Help buttons in the preferences window
 ==== GTK+ ====

trunk/libtransmission/transmission.h

@@ -658 +658 @@
 ***/
 
-void tr_sessionSetSpeedLimit_KBps( tr_session *, tr_direction, int Bps );
+void tr_sessionSetSpeedLimit_KBps( tr_session *, tr_direction, int KBps );
 int tr_sessionGetSpeedLimit_KBps( const tr_session *, tr_direction );
 

trunk/macosx/Badger.m

@@ -57 +57 @@
 {
     const float downloadRate = [[NSUserDefaults standardUserDefaults] boolForKey: @"BadgeDownloadRate"]
-                                ? tr_sessionGetPieceSpeed(fLib, TR_DOWN) : 0.0;
+                                ? tr_sessionGetPieceSpeed_KBps(fLib, TR_DOWN) : 0.0;
     const float uploadRate = [[NSUserDefaults standardUserDefaults] boolForKey: @"BadgeUploadRate"]
-                                ? tr_sessionGetPieceSpeed(fLib, TR_UP) : 0.0;
+                                ? tr_sessionGetPieceSpeed_KBps(fLib, TR_UP) : 0.0;
     
     //only update if the badged values change

trunk/macosx/Controller.m

@@ -274 +274 @@
             tr_bencDictAddBool(&settings, TR_PREFS_KEY_ALT_SPEED_ENABLED, [fDefaults boolForKey: @"SpeedLimit"]);
         
-        tr_bencDictAddInt(&settings, TR_PREFS_KEY_ALT_SPEED_UP, [fDefaults integerForKey: @"SpeedLimitUploadLimit"]);
-        tr_bencDictAddInt(&settings, TR_PREFS_KEY_ALT_SPEED_DOWN, [fDefaults integerForKey: @"SpeedLimitDownloadLimit"]);
+        tr_bencDictAddInt(&settings, TR_PREFS_KEY_ALT_SPEED_UP_KBps, [fDefaults integerForKey: @"SpeedLimitUploadLimit"]);
+        tr_bencDictAddInt(&settings, TR_PREFS_KEY_ALT_SPEED_DOWN_KBps, [fDefaults integerForKey: @"SpeedLimitDownloadLimit"]);
         
         tr_bencDictAddBool(&settings, TR_PREFS_KEY_ALT_SPEED_TIME_ENABLED, [fDefaults boolForKey: @"SpeedLimitAuto"]);
@@ -286 +286 @@
         tr_bencDictAddBool(&settings, TR_PREFS_KEY_START, [fDefaults boolForKey: @"AutoStartDownload"]);
         
-        tr_bencDictAddInt(&settings, TR_PREFS_KEY_DSPEED, [fDefaults integerForKey: @"DownloadLimit"]);
+        tr_bencDictAddInt(&settings, TR_PREFS_KEY_DSPEED_KBps, [fDefaults integerForKey: @"DownloadLimit"]);
         tr_bencDictAddBool(&settings, TR_PREFS_KEY_DSPEED_ENABLED, [fDefaults boolForKey: @"CheckDownload"]);
-        tr_bencDictAddInt(&settings, TR_PREFS_KEY_USPEED, [fDefaults integerForKey: @"UploadLimit"]);
+        tr_bencDictAddInt(&settings, TR_PREFS_KEY_USPEED_KBps, [fDefaults integerForKey: @"UploadLimit"]);
         tr_bencDictAddBool(&settings, TR_PREFS_KEY_USPEED_ENABLED, [fDefaults boolForKey: @"CheckUpload"]);
         
@@ -336 +336 @@
         fLib = tr_sessionInit("macosx", configDir, YES, &settings);
         tr_bencFree(&settings);
+        
+        #warning localize and make consistent
+        tr_formatter_size_init(1024, "bytes", "KB", "MB", "GB");
+        tr_formatter_speed_init(1024, "B/s", "KB/s", "MB/s", "GB/s");
+        tr_formatter_mem_init(1024, "bytes", "KB", "MB", "GB");
         
         [NSApp setDelegate: self];
@@ -1699 +1704 @@
             {
                 //set rates
-                [fTotalDLField setStringValue: [NSString stringForSpeed: tr_sessionGetPieceSpeed(fLib, TR_DOWN)]];
-                [fTotalULField setStringValue: [NSString stringForSpeed: tr_sessionGetPieceSpeed(fLib, TR_UP)]];
+                [fTotalDLField setStringValue: [NSString stringForSpeed: tr_sessionGetPieceSpeed_KBps(fLib, TR_DOWN)]];
+                [fTotalULField setStringValue: [NSString stringForSpeed: tr_sessionGetPieceSpeed_KBps(fLib, TR_UP)]];
                 
                 //set status button text

trunk/macosx/PrefsController.m

@@ -572 +572 @@
 {
     tr_sessionLimitSpeed(fHandle, TR_UP, [fDefaults boolForKey: @"CheckUpload"]);
-    tr_sessionSetSpeedLimit(fHandle, TR_UP, [fDefaults integerForKey: @"UploadLimit"]);
+    tr_sessionSetSpeedLimit_KBps(fHandle, TR_UP, [fDefaults integerForKey: @"UploadLimit"]);
     
     tr_sessionLimitSpeed(fHandle, TR_DOWN, [fDefaults boolForKey: @"CheckDownload"]);
-    tr_sessionSetSpeedLimit(fHandle, TR_DOWN, [fDefaults integerForKey: @"DownloadLimit"]);
+    tr_sessionSetSpeedLimit_KBps(fHandle, TR_DOWN, [fDefaults integerForKey: @"DownloadLimit"]);
     
     [[NSNotificationCenter defaultCenter] postNotificationName: @"SpeedLimitUpdate" object: nil];
@@ -582 +582 @@
 - (void) applyAltSpeedSettings
 {
-    tr_sessionSetAltSpeed(fHandle, TR_UP, [fDefaults integerForKey: @"SpeedLimitUploadLimit"]);
-    tr_sessionSetAltSpeed(fHandle, TR_DOWN, [fDefaults integerForKey: @"SpeedLimitDownloadLimit"]);
+    tr_sessionSetAltSpeed_KBps(fHandle, TR_UP, [fDefaults integerForKey: @"SpeedLimitUploadLimit"]);
+    tr_sessionSetAltSpeed_KBps(fHandle, TR_DOWN, [fDefaults integerForKey: @"SpeedLimitDownloadLimit"]);
         
     [[NSNotificationCenter defaultCenter] postNotificationName: @"SpeedLimitUpdate" object: nil];
@@ -1181 +1181 @@
     [fDefaults setBool: downLimitEnabled forKey: @"CheckDownload"];
     
-    const int downLimit = tr_sessionGetSpeedLimit(fHandle, TR_DOWN);
+    const int downLimit = tr_sessionGetSpeedLimit_KBps(fHandle, TR_DOWN);
     [fDefaults setInteger: downLimit forKey: @"DownloadLimit"];
     
@@ -1188 +1188 @@
     [fDefaults setBool: upLimitEnabled forKey: @"CheckUpload"];
     
-    const int upLimit = tr_sessionGetSpeedLimit(fHandle, TR_UP);
+    const int upLimit = tr_sessionGetSpeedLimit_KBps(fHandle, TR_UP);
     [fDefaults setInteger: upLimit forKey: @"UploadLimit"];
     
@@ -1196 +1196 @@
     
     //alt speed limit - down
-    const int downLimitAlt = tr_sessionGetAltSpeed(fHandle, TR_DOWN);
+    const int downLimitAlt = tr_sessionGetAltSpeed_KBps(fHandle, TR_DOWN);
     [fDefaults setInteger: downLimitAlt forKey: @"SpeedLimitDownloadLimit"];
     
     //alt speed limit - up
-    const int upLimitAlt = tr_sessionGetAltSpeed(fHandle, TR_UP);
+    const int upLimitAlt = tr_sessionGetAltSpeed_KBps(fHandle, TR_UP);
     [fDefaults setInteger: upLimitAlt forKey: @"SpeedLimitUploadLimit"];
     

trunk/macosx/Torrent.m

@@ -400 +400 @@
 - (NSInteger) speedLimit: (BOOL) upload
 {
-    return tr_torrentGetSpeedLimit(fHandle, upload ? TR_UP : TR_DOWN);
+    return tr_torrentGetSpeedLimit_KBps(fHandle, upload ? TR_UP : TR_DOWN);
 }
 
 - (void) setSpeedLimit: (NSInteger) limit upload: (BOOL) upload
 {
-    tr_torrentSetSpeedLimit(fHandle, upload ? TR_UP : TR_DOWN, limit);
+    tr_torrentSetSpeedLimit_KBps(fHandle, upload ? TR_UP : TR_DOWN, limit);
 }
 
@@ -884 +884 @@
         
         if (peer->isUploadingTo)
-            [dict setObject: [NSNumber numberWithFloat: peer->rateToPeer] forKey: @"UL To Rate"];
+            [dict setObject: [NSNumber numberWithFloat: peer->rateToPeer_KBps] forKey: @"UL To Rate"];
         if (peer->isDownloadingFrom)
-            [dict setObject: [NSNumber numberWithFloat: peer->rateToClient] forKey: @"DL From Rate"];
+            [dict setObject: [NSNumber numberWithFloat: peer->rateToClient_KBps] forKey: @"DL From Rate"];
         
         [peerDicts addObject: dict];
@@ -905 +905 @@
     NSMutableArray * webSeeds = [NSMutableArray arrayWithCapacity: fInfo->webseedCount];
     
-    float * dlSpeeds = tr_torrentWebSpeeds(fHandle);
+    double * dlSpeeds = tr_torrentWebSpeeds_KBps(fHandle);
     
     for (NSInteger i = 0; i < fInfo->webseedCount; i++)
@@ -1231 +1231 @@
 - (CGFloat) downloadRate
 {
-    return fStat->pieceDownloadSpeed;
+    return fStat->pieceDownloadSpeed_KBps;
 }
 
 - (CGFloat) uploadRate
 {
-    return fStat->pieceUploadSpeed;
+    return fStat->pieceUploadSpeed_KBps;
 }