mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

eliminate the redundant isPaused, instead using !isActive

This commit is contained in:
Mitchell Livingston 2007-10-20 21:27:46 +00:00
parent 264f7ab8b3
commit a90c4a4b09
5 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
macosx/Controller.m
View File

@ -2778,7 +2778,7 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi
Torrent * torrent; Torrent * torrent;
NSEnumerator * enumerator = [fTorrents objectEnumerator]; NSEnumerator * enumerator = [fTorrents objectEnumerator];
while ((torrent = [enumerator nextObject])) while ((torrent = [enumerator nextObject]))
if ([torrent isPaused] && ![torrent waitingToStart]) if (![torrent isActive] && ![torrent waitingToStart])
return YES; return YES;
return NO; return NO;
} }
@ -2800,7 +2800,7 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi
NSEnumerator * enumerator = [[fDisplayedTorrents objectsAtIndexes: [fTableView selectedRowIndexes]] objectEnumerator]; NSEnumerator * enumerator = [[fDisplayedTorrents objectsAtIndexes: [fTableView selectedRowIndexes]] objectEnumerator];
Torrent * torrent; Torrent * torrent;
while ((torrent = [enumerator nextObject])) while ((torrent = [enumerator nextObject]))
if ([torrent isPaused] && ![torrent waitingToStart]) if (![torrent isActive] && ![torrent waitingToStart])
return YES; return YES;
return NO; return NO;
} }
@ -2927,7 +2927,7 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi
Torrent * torrent; Torrent * torrent;
NSEnumerator * enumerator = [fTorrents objectEnumerator]; NSEnumerator * enumerator = [fTorrents objectEnumerator];
while ((torrent = [enumerator nextObject])) while ((torrent = [enumerator nextObject]))
if ([torrent isPaused] && ![torrent waitingToStart]) if (![torrent isActive] && ![torrent waitingToStart])
return YES; return YES;
return NO; return NO;
} }
@ -2941,7 +2941,7 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi
Torrent * torrent; Torrent * torrent;
NSEnumerator * enumerator = [fTorrents objectEnumerator]; NSEnumerator * enumerator = [fTorrents objectEnumerator];
while ((torrent = [enumerator nextObject])) while ((torrent = [enumerator nextObject]))
if ([torrent isPaused] && [torrent waitingToStart]) if (![torrent isActive] && [torrent waitingToStart])
return YES; return YES;
return NO; return NO;
} }
@ -2955,7 +2955,7 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi
NSEnumerator * enumerator = [[fDisplayedTorrents objectsAtIndexes: [fTableView selectedRowIndexes]] objectEnumerator]; NSEnumerator * enumerator = [[fDisplayedTorrents objectsAtIndexes: [fTableView selectedRowIndexes]] objectEnumerator];
Torrent * torrent; Torrent * torrent;
while ((torrent = [enumerator nextObject])) while ((torrent = [enumerator nextObject]))
if ([torrent isPaused]) if (![torrent isActive])
return YES; return YES;
return NO; return NO;
} }
@ -2983,7 +2983,7 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi
NSEnumerator * enumerator = [[fDisplayedTorrents objectsAtIndexes: [fTableView selectedRowIndexes]] objectEnumerator]; NSEnumerator * enumerator = [[fDisplayedTorrents objectsAtIndexes: [fTableView selectedRowIndexes]] objectEnumerator];
Torrent * torrent; Torrent * torrent;
while ((torrent = [enumerator nextObject])) while ((torrent = [enumerator nextObject]))
if ([torrent isPaused] && ![torrent waitingToStart]) if (![torrent isActive] && ![torrent waitingToStart])
return YES; return YES;
return NO; return NO;
} }
@ -3055,7 +3055,7 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi
enumerator = [fTorrents objectEnumerator]; enumerator = [fTorrents objectEnumerator];
while (!timeUp && (torrent = [enumerator nextObject])) while (!timeUp && (torrent = [enumerator nextObject]))
while (![torrent isPaused] && !(timeUp = [start timeIntervalSinceNow] < -5.0)) while ([torrent isActive] && !(timeUp = [start timeIntervalSinceNow] < -5.0))
{ {
usleep(100000); usleep(100000);
[torrent update]; [torrent update];

4
macosx/InfoWindowController.m
View File

@ -1345,13 +1345,13 @@ typedef enum
enumerator = [fTorrents objectEnumerator]; enumerator = [fTorrents objectEnumerator];
torrent = [enumerator nextObject]; //first torrent torrent = [enumerator nextObject]; //first torrent
BOOL pexEnabled = ![torrent privateTorrent] && [torrent isPaused]; BOOL pexEnabled = ![torrent privateTorrent] && ![torrent isActive];
int pexState = [torrent pex] ? NSOnState : NSOffState; int pexState = [torrent pex] ? NSOnState : NSOffState;
while ((torrent = [enumerator nextObject]) && (pexEnabled || pexState != NSMixedState)) while ((torrent = [enumerator nextObject]) && (pexEnabled || pexState != NSMixedState))
{ {
if (pexEnabled) if (pexEnabled)
pexEnabled = ![torrent privateTorrent] && [torrent isPaused]; pexEnabled = ![torrent privateTorrent] && ![torrent isActive];
if (pexState != NSMixedState && pexState != ([torrent pex] ? NSOnState : NSOffState)) if (pexState != NSMixedState && pexState != ([torrent pex] ? NSOnState : NSOffState))
pexState = NSMixedState; pexState = NSMixedState;

1
macosx/Torrent.h
View File

@ -158,7 +158,6 @@ typedef enum
- (BOOL) isActive; - (BOOL) isActive;
- (BOOL) isSeeding; - (BOOL) isSeeding;
- (BOOL) isPaused;
- (BOOL) isChecking; - (BOOL) isChecking;
- (BOOL) allDownloaded; - (BOOL) allDownloaded;
- (BOOL) isComplete; - (BOOL) isComplete;

7
macosx/Torrent.m
View File

@ -729,7 +729,7 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
- (BOOL) isActive - (BOOL) isActive
{ {
return fStat->status & TR_STATUS_ACTIVE; return fStat->status != TR_STATUS_STOPPED;
} }
- (BOOL) isSeeding - (BOOL) isSeeding
@ -737,11 +737,6 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
return fStat->status == TR_STATUS_SEED || fStat->status == TR_STATUS_DONE; return fStat->status == TR_STATUS_SEED || fStat->status == TR_STATUS_DONE;
} }
- (BOOL) isPaused
{
return fStat->status == TR_STATUS_STOPPED;
}
- (BOOL) isChecking - (BOOL) isChecking
{ {
return fStat->status == TR_STATUS_CHECK || fStat->status == TR_STATUS_CHECK_WAIT; return fStat->status == TR_STATUS_CHECK || fStat->status == TR_STATUS_CHECK_WAIT;

6
macosx/TorrentTableView.m
View File

@ -158,7 +158,7 @@
if ([torrent isActive]) if ([torrent isActive])
[fController stopTorrents: [NSArray arrayWithObject: torrent]]; [fController stopTorrents: [NSArray arrayWithObject: torrent]];
else if ([torrent isPaused]) else
{ {
if ([[NSApp currentEvent] modifierFlags] & NSAlternateKeyMask) if ([[NSApp currentEvent] modifierFlags] & NSAlternateKeyMask)
[fController resumeTorrentsNoWait: [NSArray arrayWithObject: torrent]]; [fController resumeTorrentsNoWait: [NSArray arrayWithObject: torrent]];
@ -167,7 +167,6 @@
else else
[fController resumeTorrents: [NSArray arrayWithObject: torrent]]; [fController resumeTorrents: [NSArray arrayWithObject: torrent]];
} }
else;
} }
else if (row == oldRow && [self pointInRevealRect: point] && [self pointInRevealRect: fClickPoint]) else if (row == oldRow && [self pointInRevealRect: point] && [self pointInRevealRect: fClickPoint])
[[fTorrents objectAtIndex: row] revealData]; [[fTorrents objectAtIndex: row] revealData];
@ -460,7 +459,7 @@
NSRect pauseRect = [self pauseRectForRow: row]; NSRect pauseRect = [self pauseRectForRow: row];
if ([torrent isActive]) if ([torrent isActive])
pauseImage = fClickIn && NSPointInRect(fClickPoint, pauseRect) ? fPauseOnIcon : fPauseOffIcon; pauseImage = fClickIn && NSPointInRect(fClickPoint, pauseRect) ? fPauseOnIcon : fPauseOffIcon;
else if ([torrent isPaused]) else
{ {
BOOL inPauseRect = fClickIn && NSPointInRect(fClickPoint, pauseRect); BOOL inPauseRect = fClickIn && NSPointInRect(fClickPoint, pauseRect);
if ([[NSApp currentEvent] modifierFlags] & NSAlternateKeyMask && [fDefaults boolForKey: @"Queue"]) if ([[NSApp currentEvent] modifierFlags] & NSAlternateKeyMask && [fDefaults boolForKey: @"Queue"])
@ -470,7 +469,6 @@
else else
pauseImage = inPauseRect ? fResumeOnIcon : fResumeOffIcon; pauseImage = inPauseRect ? fResumeOnIcon : fResumeOffIcon;
} }
else;
if (pauseImage) if (pauseImage)
[pauseImage compositeToPoint: NSMakePoint(pauseRect.origin.x, NSMaxY(pauseRect)) operation: NSCompositeSourceOver]; [pauseImage compositeToPoint: NSMakePoint(pauseRect.origin.x, NSMaxY(pauseRect)) operation: NSCompositeSourceOver];