mirror of
https://github.com/transmission/transmission
synced 2025-02-05 05:53:59 +00:00
merge upload and download speed methods
This commit is contained in:
Mitchell Livingston
parent
2a601cb513
commit
0927851321
3 changed files with 36 additions and 61 deletions
|
|
@ -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];
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Reference in a new issue