From 0927851321d67b92786d19ab6b3dca88e8ea6817 Mon Sep 17 00:00:00 2001 From: Mitchell Livingston Date: Sat, 21 Jul 2007 03:13:11 +0000 Subject: [PATCH] merge upload and download speed methods --- macosx/InfoWindowController.m | 24 +++++++------- macosx/Torrent.h | 13 +++----- macosx/Torrent.m | 60 ++++++++++++----------------------- 3 files changed, 36 insertions(+), 61 deletions(-) diff --git a/macosx/InfoWindowController.m b/macosx/InfoWindowController.m index 82158ea69..e2238de9d 100644 --- a/macosx/InfoWindowController.m +++ b/macosx/InfoWindowController.m @@ -458,25 +458,25 @@ NSEnumerator * enumerator = [fTorrents objectEnumerator]; torrent = [enumerator nextObject]; //first torrent - int uploadSpeedMode = [torrent uploadSpeedMode], - uploadSpeedLimit = [torrent uploadSpeedLimit], - downloadSpeedMode = [torrent downloadSpeedMode], - downloadSpeedLimit = [torrent downloadSpeedLimit]; + int uploadSpeedMode = [torrent speedMode: YES], + uploadSpeedLimit = [torrent speedLimit: YES], + downloadSpeedMode = [torrent speedMode: NO], + downloadSpeedLimit = [torrent speedLimit: NO]; while ((uploadSpeedMode != INVALID || uploadSpeedLimit != INVALID || downloadSpeedMode != INVALID || downloadSpeedLimit != INVALID) && (torrent = [enumerator nextObject])) { - if (uploadSpeedMode != INVALID && uploadSpeedMode != [torrent uploadSpeedMode]) + if (uploadSpeedMode != INVALID && uploadSpeedMode != [torrent speedMode: YES]) uploadSpeedMode = INVALID; - if (uploadSpeedLimit != INVALID && uploadSpeedLimit != [torrent uploadSpeedLimit]) + if (uploadSpeedLimit != INVALID && uploadSpeedLimit != [torrent speedLimit: YES]) uploadSpeedLimit = INVALID; - if (downloadSpeedMode != INVALID && downloadSpeedMode != [torrent downloadSpeedMode]) + if (downloadSpeedMode != INVALID && downloadSpeedMode != [torrent speedMode: NO]) downloadSpeedMode = INVALID; - if (downloadSpeedLimit != INVALID && downloadSpeedLimit != [torrent downloadSpeedLimit]) + if (downloadSpeedLimit != INVALID && downloadSpeedLimit != [torrent speedLimit: NO]) downloadSpeedLimit = INVALID; } @@ -1109,7 +1109,7 @@ Torrent * torrent; NSEnumerator * enumerator = [fTorrents objectEnumerator]; while ((torrent = [enumerator nextObject])) - upload ? [torrent setUploadSpeedMode: mode] : [torrent setDownloadSpeedMode: mode]; + [torrent setSpeedMode: mode upload: upload]; NSTextField * field = upload ? fUploadLimitField : fDownloadLimitField; @@ -1138,9 +1138,9 @@ NSBeep(); torrent = [enumerator nextObject]; //use first torrent - limit = upload ? [torrent uploadSpeedLimit] : [torrent downloadSpeedLimit]; + limit = [torrent speedLimit: upload]; while ((torrent = [enumerator nextObject])) - if (limit != (upload ? [torrent uploadSpeedLimit] : [torrent downloadSpeedLimit])) + if (limit != [torrent speedLimit: upload]) { [sender setStringValue: @""]; return; @@ -1151,7 +1151,7 @@ else { while ((torrent = [enumerator nextObject])) - upload ? [torrent setUploadSpeedLimit: limit] : [torrent setDownloadSpeedLimit: limit]; + [torrent setSpeedLimit: limit upload: upload]; } } diff --git a/macosx/Torrent.h b/macosx/Torrent.h index ddae4c5aa..4aaa5ce6a 100644 --- a/macosx/Torrent.h +++ b/macosx/Torrent.h @@ -104,15 +104,10 @@ - (float) actualStopRatio; //returns INVALID if will not stop - (float) progressStopRatio; -#warning merge up and down? -- (int) uploadSpeedMode; -- (void) setUploadSpeedMode: (int) mode; -- (int) uploadSpeedLimit; -- (void) setUploadSpeedLimit: (int) limit; -- (int) downloadSpeedMode; -- (void) setDownloadSpeedMode: (int) mode; -- (int) downloadSpeedLimit; -- (void) setDownloadSpeedLimit: (int) limit; +- (int) speedMode: (BOOL) upload; +- (void) setSpeedMode: (int) mode upload: (BOOL) upload; +- (int) speedLimit: (BOOL) upload; +- (void) setSpeedLimit: (int) limit upload: (BOOL) upload; - (void) setWaitToStart: (BOOL) wait; - (BOOL) waitingToStart; diff --git a/macosx/Torrent.m b/macosx/Torrent.m index 6a6a80ecc..4c880212f 100644 --- a/macosx/Torrent.m +++ b/macosx/Torrent.m @@ -626,44 +626,24 @@ static uint32_t kRed = BE(0xFF6450FF), //255, 100, 80 return 0; } -- (int) uploadSpeedMode +- (int) speedMode: (BOOL) upload { - return tr_torrentGetSpeedMode(fHandle, TR_UP); + return tr_torrentGetSpeedMode(fHandle, upload ? TR_UP : TR_DOWN); } -- (void) setUploadSpeedMode: (int) mode +- (void) setSpeedMode: (int) mode upload: (BOOL) upload { - tr_torrentSetSpeedMode(fHandle, TR_UP, mode); + tr_torrentSetSpeedMode(fHandle, upload ? TR_UP : TR_DOWN, mode); } -- (int) uploadSpeedLimit +- (int) uploadSpeedLimit: (BOOL) upload { - return tr_torrentGetSpeedLimit(fHandle, TR_UP); + return tr_torrentGetSpeedLimit(fHandle, upload ? TR_UP : TR_DOWN); } -- (void) setUploadSpeedLimit: (int) limit +- (void) setUploadSpeedLimit: (int) limit upload: (BOOL) upload { - tr_torrentSetSpeedLimit(fHandle, TR_UP, limit); -} - -- (int) downloadSpeedMode -{ - return tr_torrentGetSpeedMode(fHandle, TR_DOWN); -} - -- (void) setDownloadSpeedMode: (int) mode -{ - tr_torrentSetSpeedMode(fHandle, TR_DOWN, mode); -} - -- (int) downloadSpeedLimit -{ - return tr_torrentGetSpeedLimit(fHandle, TR_DOWN); -} - -- (void) setDownloadSpeedLimit: (int) limit -{ - tr_torrentSetSpeedLimit(fHandle, TR_DOWN, limit); + tr_torrentSetSpeedLimit(fHandle, upload ? TR_UP : TR_DOWN, limit); } - (void) setWaitToStart: (BOOL) wait @@ -1829,15 +1809,15 @@ static uint32_t kRed = BE(0xFF6450FF), //255, 100, 80 return; fQuickPauseDict = [[NSDictionary alloc] initWithObjectsAndKeys: - [NSNumber numberWithInt: [self uploadSpeedMode]], @"UploadSpeedMode", - [NSNumber numberWithInt: [self uploadSpeedLimit]], @"UploadSpeedLimit", - [NSNumber numberWithInt: [self downloadSpeedMode]], @"DownloadSpeedMode", - [NSNumber numberWithInt: [self downloadSpeedLimit]], @"DownloadSpeedLimit", nil]; + [NSNumber numberWithInt: [self speedMode: YES]], @"UploadSpeedMode", + [NSNumber numberWithInt: [self speedLimit: YES]], @"UploadSpeedLimit", + [NSNumber numberWithInt: [self speedMode: NO]], @"DownloadSpeedMode", + [NSNumber numberWithInt: [self speedLimit: NO]], @"DownloadSpeedLimit", nil]; - [self setUploadSpeedMode: TR_SPEEDLIMIT_SINGLE]; - [self setUploadSpeedLimit: 0]; - [self setDownloadSpeedMode: TR_SPEEDLIMIT_SINGLE]; - [self setDownloadSpeedLimit: 0]; + [self setSpeedMode: TR_SPEEDLIMIT_SINGLE upload: YES]; + [self setSpeedLimit: 0 upload: YES]; + [self setSpeedMode: TR_SPEEDLIMIT_SINGLE upload: NO]; + [self setSpeedLimit: 0 upload: NO]; } - (void) endQuickPause @@ -1845,10 +1825,10 @@ static uint32_t kRed = BE(0xFF6450FF), //255, 100, 80 if (!fQuickPauseDict) return - [self setUploadSpeedMode: [[fQuickPauseDict objectForKey: @"UploadSpeedMode"] intValue]]; - [self setUploadSpeedLimit: [[fQuickPauseDict objectForKey: @"UploadSpeedLimit"] intValue]]; - [self setDownloadSpeedMode: [[fQuickPauseDict objectForKey: @"DownloadSpeedMode"] intValue]]; - [self setDownloadSpeedLimit: [[fQuickPauseDict objectForKey: @"DownloadSpeedLimit"] intValue]]; + [self setSpeedMode: [[fQuickPauseDict objectForKey: @"UploadSpeedMode"] intValue] upload: YES]; + [self setSpeedLimit: [[fQuickPauseDict objectForKey: @"UploadSpeedLimit"] intValue] upload: YES]; + [self setSpeedMode: [[fQuickPauseDict objectForKey: @"DownloadSpeedMode"] intValue] upload: NO]; + [self setSpeedLimit: [[fQuickPauseDict objectForKey: @"DownloadSpeedLimit"] intValue] upload: NO]; [fQuickPauseDict release]; fQuickPauseDict = nil;