summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordynaflash <[email protected]>2009-03-02 05:58:27 +0000
committerdynaflash <[email protected]>2009-03-02 05:58:27 +0000
commitb562bba490ec89339ad839f2e519e5c710fdbaeb (patch)
treed734444bef80f07c8242e4c0032f4bdfb2611889
parent335620a40972229ff4799a8852c45eb061317a12 (diff)
MacGui: Fix main window progress indicators for scan and encode for x86_64
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2194 b64f7644-9d1e-0410-96f1-a4d463321fa5
-rw-r--r--macosx/Controller.mm5
1 files changed, 3 insertions, 2 deletions
diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index 00bb5e729..3d078cf5e 100644
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -595,7 +595,7 @@ static NSString * ChooseSourceIdentifier = @"Choose Source It
NSLocalizedString( @"Scanning title %d of %d...", @"" ),
p.title_cur, p.title_count]];
[fScanIndicator setHidden: NO];
- [fScanIndicator setDoubleValue: 100.0 * ( p.title_cur - 1 ) / p.title_count];
+ [fScanIndicator setDoubleValue: 100.0 * ((double)( p.title_cur - 1 ) / p.title_count)];
break;
}
#undef p
@@ -696,7 +696,6 @@ static NSString * ChooseSourceIdentifier = @"Choose Source It
#define p s.param.working
case HB_STATE_WORKING:
{
- float progress_total;
NSMutableString * string;
/* Update text field */
string = [NSMutableString stringWithFormat: NSLocalizedString( @"Encoding: pass %d of %d, %.2f %%", @"" ), p.job_cur, p.job_count, 100.0 * p.progress];
@@ -712,9 +711,11 @@ static NSString * ChooseSourceIdentifier = @"Choose Source It
/* Set the status string in fQueueController as well */
[fQueueController setQueueStatusString: string];
/* Update slider */
+ double progress_total;
progress_total = ( p.progress + p.job_cur - 1 ) / p.job_count;
[fRipIndicator setIndeterminate: NO];
[fRipIndicator setDoubleValue: 100.0 * progress_total];
+ //[fRipIndicator setDoubleValue: 100.0 * p.progress];
// If progress bar hasn't been revealed at the bottom of the window, do
// that now. This code used to be in doRip. I moved it to here to handle