Mac build compiles again
This commit is contained in:
Mitchell Livingston
parent
7e2175858f
commit
ed74e0009b
2
NEWS
2
NEWS
|
|
@ -5,7 +5,7 @@
|
|||
* Speed up moving local data from one disk to another
|
||||
* 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+ ====
|
||||
* Faster torrent file parsing
|
||||
|
|
|
|||
|
|
@ -657,7 +657,7 @@ tr_direction;
|
|||
**** Primary session speed limits
|
||||
***/
|
||||
|
||||
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 );
|
||||
|
||||
void tr_sessionLimitSpeed ( tr_session *, tr_direction, tr_bool );
|
||||
|
|
|
|||
|
|
@ -56,9 +56,9 @@
|
|||
- (void) updateBadge
|
||||
{
|
||||
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
|
||||
if ([(BadgeView *)[[NSApp dockTile] contentView] setRatesWithDownload: downloadRate upload: uploadRate])
|
||||
|
|
|
|||
|
|
@ -273,8 +273,8 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
|
|||
if (!usesSpeedLimitSched)
|
||||
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"]);
|
||||
tr_bencDictAddInt(&settings, TR_PREFS_KEY_ALT_SPEED_TIME_BEGIN, [PrefsController dateToTimeSum:
|
||||
|
|
@ -285,9 +285,9 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
|
|||
|
||||
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"]);
|
||||
|
||||
//hidden prefs
|
||||
|
|
@ -336,6 +336,11 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
|
|||
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];
|
||||
|
||||
//register for magnet URLs (has to be in init)
|
||||
|
|
@ -1698,8 +1703,8 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
|
|||
if (![fStatusBar isHidden])
|
||||
{
|
||||
//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
|
||||
NSString * statusLabel = [fDefaults stringForKey: @"StatusLabel"], * statusString;
|
||||
|
|
|
|||
|
|
@ -571,18 +571,18 @@ tr_session * fHandle;
|
|||
- (void) applySpeedSettings: (id) sender
|
||||
{
|
||||
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];
|
||||
}
|
||||
|
||||
- (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];
|
||||
}
|
||||
|
|
@ -1180,14 +1180,14 @@ tr_session * fHandle;
|
|||
const BOOL downLimitEnabled = tr_sessionIsSpeedLimited(fHandle, TR_DOWN);
|
||||
[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"];
|
||||
|
||||
//speed limit - up
|
||||
const BOOL upLimitEnabled = tr_sessionIsSpeedLimited(fHandle, TR_UP);
|
||||
[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"];
|
||||
|
||||
//alt speed limit enabled
|
||||
|
|
@ -1195,11 +1195,11 @@ tr_session * fHandle;
|
|||
[fDefaults setBool: useAltSpeed forKey: @"SpeedLimit"];
|
||||
|
||||
//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"];
|
||||
|
||||
//alt speed limit schedule
|
||||
|
|
|
|||
|
|
@ -399,12 +399,12 @@ int trashDataFile(const char * filename)
|
|||
|
||||
- (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);
|
||||
}
|
||||
|
||||
- (BOOL) usesGlobalSpeedLimit
|
||||
|
|
@ -883,9 +883,9 @@ int trashDataFile(const char * filename)
|
|||
[dict setObject: [NSString stringWithUTF8String: peer->flagStr] forKey: @"Flags"];
|
||||
|
||||
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];
|
||||
}
|
||||
|
|
@ -904,7 +904,7 @@ int trashDataFile(const char * filename)
|
|||
{
|
||||
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++)
|
||||
{
|
||||
|
|
@ -1230,12 +1230,12 @@ int trashDataFile(const char * filename)
|
|||
|
||||
- (CGFloat) downloadRate
|
||||
{
|
||||
return fStat->pieceDownloadSpeed;
|
||||
return fStat->pieceDownloadSpeed_KBps;
|
||||
}
|
||||
|
||||
- (CGFloat) uploadRate
|
||||
{
|
||||
return fStat->pieceUploadSpeed;
|
||||
return fStat->pieceUploadSpeed_KBps;
|
||||
}
|
||||
|
||||
- (CGFloat) totalRate
|
||||
|
|
|
|||
Loading…
Reference in New Issue