mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-02-05 05:53:59 +00:00
Code Issues Releases Wiki Activity

merge upload and download speed methods

Browse source
This commit is contained in:
Mitchell Livingston 2007-07-21 03:13:11 +00:00
parent 2a601cb513
commit 0927851321
3 changed files with 36 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
macosx/InfoWindowController.m
View file

@ -458,25 +458,25 @@
NSEnumerator * enumerator = [fTorrents objectEnumerator]; NSEnumerator * enumerator = [fTorrents objectEnumerator];
torrent = [enumerator nextObject]; //first torrent torrent = [enumerator nextObject]; //first torrent
int uploadSpeedMode = [torrent uploadSpeedMode], int uploadSpeedMode = [torrent speedMode: YES],
uploadSpeedLimit = [torrent uploadSpeedLimit], uploadSpeedLimit = [torrent speedLimit: YES],
downloadSpeedMode = [torrent downloadSpeedMode], downloadSpeedMode = [torrent speedMode: NO],
downloadSpeedLimit = [torrent downloadSpeedLimit]; downloadSpeedLimit = [torrent speedLimit: NO];
while ((uploadSpeedMode != INVALID || uploadSpeedLimit != INVALID while ((uploadSpeedMode != INVALID || uploadSpeedLimit != INVALID
|| downloadSpeedMode != INVALID || downloadSpeedLimit != INVALID) || downloadSpeedMode != INVALID || downloadSpeedLimit != INVALID)
&& (torrent = [enumerator nextObject])) && (torrent = [enumerator nextObject]))
{ {
if (uploadSpeedMode != INVALID && uploadSpeedMode != [torrent uploadSpeedMode]) if (uploadSpeedMode != INVALID && uploadSpeedMode != [torrent speedMode: YES])
uploadSpeedMode = INVALID; uploadSpeedMode = INVALID;
if (uploadSpeedLimit != INVALID && uploadSpeedLimit != [torrent uploadSpeedLimit]) if (uploadSpeedLimit != INVALID && uploadSpeedLimit != [torrent speedLimit: YES])
uploadSpeedLimit = INVALID; uploadSpeedLimit = INVALID;
if (downloadSpeedMode != INVALID && downloadSpeedMode != [torrent downloadSpeedMode]) if (downloadSpeedMode != INVALID && downloadSpeedMode != [torrent speedMode: NO])
downloadSpeedMode = INVALID; downloadSpeedMode = INVALID;
if (downloadSpeedLimit != INVALID && downloadSpeedLimit != [torrent downloadSpeedLimit]) if (downloadSpeedLimit != INVALID && downloadSpeedLimit != [torrent speedLimit: NO])
downloadSpeedLimit = INVALID; downloadSpeedLimit = INVALID;
} }
@ -1109,7 +1109,7 @@
Torrent * torrent; Torrent * torrent;
NSEnumerator * enumerator = [fTorrents objectEnumerator]; NSEnumerator * enumerator = [fTorrents objectEnumerator];
while ((torrent = [enumerator nextObject])) while ((torrent = [enumerator nextObject]))
upload ? [torrent setUploadSpeedMode: mode] : [torrent setDownloadSpeedMode: mode]; [torrent setSpeedMode: mode upload: upload];
NSTextField * field = upload ? fUploadLimitField : fDownloadLimitField; NSTextField * field = upload ? fUploadLimitField : fDownloadLimitField;
@ -1138,9 +1138,9 @@
NSBeep(); NSBeep();
torrent = [enumerator nextObject]; //use first torrent torrent = [enumerator nextObject]; //use first torrent
limit = upload ? [torrent uploadSpeedLimit] : [torrent downloadSpeedLimit]; limit = [torrent speedLimit: upload];
while ((torrent = [enumerator nextObject])) while ((torrent = [enumerator nextObject]))
if (limit != (upload ? [torrent uploadSpeedLimit] : [torrent downloadSpeedLimit])) if (limit != [torrent speedLimit: upload])
{ {
[sender setStringValue: @""]; [sender setStringValue: @""];
return; return;
@ -1151,7 +1151,7 @@
else else
{ {
while ((torrent = [enumerator nextObject])) while ((torrent = [enumerator nextObject]))
upload ? [torrent setUploadSpeedLimit: limit] : [torrent setDownloadSpeedLimit: limit]; [torrent setSpeedLimit: limit upload: upload];
} }
} }

13
macosx/Torrent.h
View file

@ -104,15 +104,10 @@
- (float) actualStopRatio; //returns INVALID if will not stop - (float) actualStopRatio; //returns INVALID if will not stop
- (float) progressStopRatio; - (float) progressStopRatio;
#warning merge up and down? - (int) speedMode: (BOOL) upload;
- (int) uploadSpeedMode; - (void) setSpeedMode: (int) mode upload: (BOOL) upload;
- (void) setUploadSpeedMode: (int) mode; - (int) speedLimit: (BOOL) upload;
- (int) uploadSpeedLimit; - (void) setSpeedLimit: (int) limit upload: (BOOL) upload;
- (void) setUploadSpeedLimit: (int) limit;
- (int) downloadSpeedMode;
- (void) setDownloadSpeedMode: (int) mode;
- (int) downloadSpeedLimit;
- (void) setDownloadSpeedLimit: (int) limit;
- (void) setWaitToStart: (BOOL) wait; - (void) setWaitToStart: (BOOL) wait;
- (BOOL) waitingToStart; - (BOOL) waitingToStart;

60
macosx/Torrent.m
View file

@ -626,44 +626,24 @@ static uint32_t kRed = BE(0xFF6450FF), //255, 100, 80
return 0; 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); tr_torrentSetSpeedLimit(fHandle, upload ? TR_UP : TR_DOWN, 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);
} }
- (void) setWaitToStart: (BOOL) wait - (void) setWaitToStart: (BOOL) wait
@ -1829,15 +1809,15 @@ static uint32_t kRed = BE(0xFF6450FF), //255, 100, 80
return; return;
fQuickPauseDict = [[NSDictionary alloc] initWithObjectsAndKeys: fQuickPauseDict = [[NSDictionary alloc] initWithObjectsAndKeys:
[NSNumber numberWithInt: [self uploadSpeedMode]], @"UploadSpeedMode", [NSNumber numberWithInt: [self speedMode: YES]], @"UploadSpeedMode",
[NSNumber numberWithInt: [self uploadSpeedLimit]], @"UploadSpeedLimit", [NSNumber numberWithInt: [self speedLimit: YES]], @"UploadSpeedLimit",
[NSNumber numberWithInt: [self downloadSpeedMode]], @"DownloadSpeedMode", [NSNumber numberWithInt: [self speedMode: NO]], @"DownloadSpeedMode",
[NSNumber numberWithInt: [self downloadSpeedLimit]], @"DownloadSpeedLimit", nil]; [NSNumber numberWithInt: [self speedLimit: NO]], @"DownloadSpeedLimit", nil];
[self setUploadSpeedMode: TR_SPEEDLIMIT_SINGLE]; [self setSpeedMode: TR_SPEEDLIMIT_SINGLE upload: YES];
[self setUploadSpeedLimit: 0]; [self setSpeedLimit: 0 upload: YES];
[self setDownloadSpeedMode: TR_SPEEDLIMIT_SINGLE]; [self setSpeedMode: TR_SPEEDLIMIT_SINGLE upload: NO];
[self setDownloadSpeedLimit: 0]; [self setSpeedLimit: 0 upload: NO];
} }
- (void) endQuickPause - (void) endQuickPause
@ -1845,10 +1825,10 @@ static uint32_t kRed = BE(0xFF6450FF), //255, 100, 80
if (!fQuickPauseDict) if (!fQuickPauseDict)
return return
[self setUploadSpeedMode: [[fQuickPauseDict objectForKey: @"UploadSpeedMode"] intValue]]; [self setSpeedMode: [[fQuickPauseDict objectForKey: @"UploadSpeedMode"] intValue] upload: YES];
[self setUploadSpeedLimit: [[fQuickPauseDict objectForKey: @"UploadSpeedLimit"] intValue]]; [self setSpeedLimit: [[fQuickPauseDict objectForKey: @"UploadSpeedLimit"] intValue] upload: YES];
[self setDownloadSpeedMode: [[fQuickPauseDict objectForKey: @"DownloadSpeedMode"] intValue]]; [self setSpeedMode: [[fQuickPauseDict objectForKey: @"DownloadSpeedMode"] intValue] upload: NO];
[self setDownloadSpeedLimit: [[fQuickPauseDict objectForKey: @"DownloadSpeedLimit"] intValue]]; [self setSpeedLimit: [[fQuickPauseDict objectForKey: @"DownloadSpeedLimit"] intValue] upload: NO];
[fQuickPauseDict release]; [fQuickPauseDict release];
fQuickPauseDict = nil; fQuickPauseDict = nil;