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

#3940 Global displayed speed does not include webseeds; remove a now-unused libT speed function

This commit is contained in:
Mitchell Livingston 2011-01-23 18:23:52 +00:00
parent d38634a3f7
commit a1eedd117d
5 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libtransmission/session.c
View File

@ -1674,11 +1674,6 @@ tr_sessionGetPieceSpeed_Bps( const tr_session * session, tr_direction dir )
{
return tr_isSession( session ) ? tr_bandwidthGetPieceSpeed_Bps( session->bandwidth, 0, dir ) : 0;
}
double
tr_sessionGetPieceSpeed_KBps( const tr_session * session, tr_direction dir )
{
return toSpeedKBps( tr_sessionGetPieceSpeed_Bps( session, dir ) );
}
int
tr_sessionGetRawSpeed_Bps( const tr_session * session, tr_direction dir )

1
libtransmission/transmission.h
View File

@ -690,7 +690,6 @@ tr_bool tr_sessionGetActiveSpeedLimit_KBps( const tr_session * session,
***/
double tr_sessionGetRawSpeed_KBps ( const tr_session *, tr_direction );
double tr_sessionGetPieceSpeed_KBps( const tr_session *, tr_direction );
void tr_sessionSetRatioLimited ( tr_session *, tr_bool isLimited );
tr_bool tr_sessionIsRatioLimited ( const tr_session * );

2
macosx/Badger.h
View File

@ -34,7 +34,7 @@
- (id) initWithLib: (tr_session *) lib;
- (void) updateBadge;
- (void) updateBadgeWithDownload: (CGFloat) downloadRate upload: (CGFloat) uploadRate;
- (void) incrementCompleted;
- (void) clearCompleted;
- (void) setQuitting;

15
macosx/Badger.m
View File

@ -38,9 +38,6 @@
BadgeView * view = [[BadgeView alloc] initWithFrame: [[[NSApp dockTile] contentView] frame] lib: lib];
[[NSApp dockTile] setContentView: view];
[view release];
//change that just impacts the dock badge
[[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(updateBadge) name: @"DockBadgeChange" object: nil];
}
return self;
@ -53,15 +50,15 @@
[super dealloc];
}
- (void) updateBadge
- (void) updateBadgeWithDownload: (CGFloat) downloadRate upload: (CGFloat) uploadRate
{
const double downloadRate = [[NSUserDefaults standardUserDefaults] boolForKey: @"BadgeDownloadRate"]
? tr_sessionGetPieceSpeed_KBps(fLib, TR_DOWN) : 0.0;
const double uploadRate = [[NSUserDefaults standardUserDefaults] boolForKey: @"BadgeUploadRate"]
? tr_sessionGetPieceSpeed_KBps(fLib, TR_UP) : 0.0;
const CGFloat displayDlRate = [[NSUserDefaults standardUserDefaults] boolForKey: @"BadgeDownloadRate"]
? downloadRate : 0.0;
const CGFloat displayUlRate = [[NSUserDefaults standardUserDefaults] boolForKey: @"BadgeUploadRate"]
? uploadRate : 0.0;
//only update if the badged values change
if ([(BadgeView *)[[NSApp dockTile] contentView] setRatesWithDownload: downloadRate upload: uploadRate])
if ([(BadgeView *)[[NSApp dockTile] contentView] setRatesWithDownload: displayDlRate upload: displayUlRate])
[[NSApp dockTile] display];
}

14
macosx/Controller.m
View File

@ -1717,6 +1717,14 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
{
[fTorrents makeObjectsPerformSelector: @selector(update)];
//pull the upload and download speeds - most consistent by using current stats
CGFloat dlRate = 0.0, ulRate = 0.0;
for (Torrent * torrent in fTorrents)
{
dlRate += [torrent downloadRate];
ulRate += [torrent uploadRate];
}
if (![NSApp isHidden])
{
if ([fWindow isVisible])
@ -1727,8 +1735,8 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
if (![fStatusBar isHidden])
{
//set rates
[fTotalDLField setStringValue: [NSString stringForSpeed: tr_sessionGetPieceSpeed_KBps(fLib, TR_DOWN)]];
[fTotalULField setStringValue: [NSString stringForSpeed: tr_sessionGetPieceSpeed_KBps(fLib, TR_UP)]];
[fTotalDLField setStringValue: [NSString stringForSpeed: dlRate]];
[fTotalULField setStringValue: [NSString stringForSpeed: ulRate]];
//set status button text
NSString * statusLabel = [fDefaults stringForKey: @"StatusLabel"], * statusString;
@ -1770,7 +1778,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
}
//badge dock
[fBadger updateBadge];
[fBadger updateBadgeWithDownload: dlRate upload: ulRate];
}
- (void) resizeStatusButton