From c8799f36f33f598f8fcba197ee5ca90fee7d7a8c Mon Sep 17 00:00:00 2001 From: Mitchell Livingston Date: Mon, 25 Feb 2008 23:57:49 +0000 Subject: [PATCH] temp code for testing time output --- macosx/NSStringAdditions.h | 2 +- macosx/NSStringAdditions.m | 5 +++-- macosx/Torrent.m | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/macosx/NSStringAdditions.h b/macosx/NSStringAdditions.h index 49b56d4c3..1f8b4a124 100644 --- a/macosx/NSStringAdditions.h +++ b/macosx/NSStringAdditions.h @@ -36,7 +36,7 @@ + (NSString *) stringForRatio: (float) ratio; + (NSString *) timeString: (uint64_t) seconds showSeconds: (BOOL) showSeconds; -+ (NSString *) timeString: (uint64_t) seconds showSeconds: (BOOL) showSeconds maxDigits: (NSUInteger) max; ++ (NSString *) timeString: (NSUInteger) seconds showSeconds: (BOOL) showSeconds maxDigits: (NSUInteger) max; - (NSComparisonResult) compareIP: (NSString *) string; diff --git a/macosx/NSStringAdditions.m b/macosx/NSStringAdditions.m index 75eb65a18..a740ab3b3 100644 --- a/macosx/NSStringAdditions.m +++ b/macosx/NSStringAdditions.m @@ -104,11 +104,12 @@ + (NSString *) timeString: (uint64_t) seconds showSeconds: (BOOL) showSeconds { - return [NSString timeString: seconds showSeconds:showSeconds maxDigits: UINT_MAX]; + return [NSString timeString: seconds showSeconds: showSeconds maxDigits: UINT_MAX]; } -+ (NSString *) timeString: (uint64_t) seconds showSeconds: (BOOL) showSeconds maxDigits: (NSUInteger) max ++ (NSString *) timeString: (NSUInteger) seconds showSeconds: (BOOL) showSeconds maxDigits: (NSUInteger) max { + NSLog(@"seconds: %u max digits: %u", seconds, max); NSMutableArray * timeArray = [NSMutableArray arrayWithCapacity: MIN(max, 4)]; uint64_t remaining = seconds; diff --git a/macosx/Torrent.m b/macosx/Torrent.m index 3d78f4511..97ba0149b 100644 --- a/macosx/Torrent.m +++ b/macosx/Torrent.m @@ -1113,7 +1113,7 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void * int eta = [self isSeeding] ? [self etaRatio] : [self eta]; return eta >= 0 ? [NSString timeString: eta showSeconds: YES maxDigits: 2] - : NSLocalizedString(@"Unknown", "Torrent -> remaining time"); + : NSLocalizedString(@"Unknown", "Torrent -> remaining time"); } - (NSString *) stateString