From 334edb802327776d74cbb546507c3f214ba8a784 Mon Sep 17 00:00:00 2001 From: jstebbins Date: Wed, 18 Jul 2012 12:27:46 +0000 Subject: More fine grained progress statistics during subtitle scan Make reader compute subtitle scan progress based on timestamps seen and duration instead of chapter marks. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4864 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- macosx/Controller.m | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'macosx/Controller.m') diff --git a/macosx/Controller.m b/macosx/Controller.m index 809571bf6..cf6fdd6c4 100644 --- a/macosx/Controller.m +++ b/macosx/Controller.m @@ -914,9 +914,18 @@ static NSString * ChooseSourceIdentifier = @"Choose Source It if( p.seconds > -1 ) { - [string appendFormat: - NSLocalizedString( @" (%.2f fps, avg %.2f fps, ETA %02dh%02dm%02ds)", @"" ), - p.rate_cur, p.rate_avg, p.hours, p.minutes, p.seconds]; + if ( p.rate_cur > 0.0 ) + { + [string appendFormat: + NSLocalizedString( @" (%.2f fps, avg %.2f fps, ETA %02dh%02dm%02ds)", @"" ), + p.rate_cur, p.rate_avg, p.hours, p.minutes, p.seconds]; + } + else + { + [string appendFormat: + NSLocalizedString( @" (ETA %02dh%02dm%02ds)", @"" ), + p.hours, p.minutes, p.seconds]; + } } [fStatusField setStringValue: string]; [fQueueController setQueueStatusString:string]; -- cgit v1.2.3