diff options
| author | jstebbins <[email protected]> | 2015-03-07 22:25:48 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2015-03-07 22:25:48 +0000 |
| commit | 7705413a03a90c16734b40fb7bc492be8b56ab6f (patch) | |
| tree | 2b3c861e0a7b78e45869a191b20f7dc57c0fe48b /macosx | |
| parent | a4ad5062c3fa1787b208389123bb81ea57483142 (diff) | |
json: automatically scan title when processing json jobs
Simplifies the WinGui.
This also changes how jobs are processed. Creating the sub-jobs for
multiple passes is delayed until after scanning and immediately before
running the job.
Working status has also changed. Sub-job passes are identified in status
with an ID that allows the frontend to definitively identify what pass
is in progress.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6976 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'macosx')
| -rw-r--r-- | macosx/HBQueueController.m | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/macosx/HBQueueController.m b/macosx/HBQueueController.m index f3ec9fcf6..89e40e02f 100644 --- a/macosx/HBQueueController.m +++ b/macosx/HBQueueController.m @@ -596,7 +596,7 @@ case HBStateWorking: { NSString *pass_desc = @""; - if (p.job_cur == 1 && p.job_count > 1) + if (p.pass_id == HB_PASS_SUBTITLE && p.pass_count > 1) { if ([self.currentJob.subtitles.tracks.firstObject[keySubTrackIndex] intValue] == -1) { @@ -609,14 +609,14 @@ string = [NSMutableString stringWithFormat: NSLocalizedString(@"Encoding: %@ \nPass %d %@ of %d, %.2f %%", @""), self.currentJob.destURL.lastPathComponent, - p.job_cur, pass_desc, p.job_count, 100.0 * p.progress]; + p.pass, pass_desc, p.pass_count, 100.0 * p.progress]; } else { string = [NSMutableString stringWithFormat: NSLocalizedString(@"Encoding: %@ \nPass %d of %d, %.2f %%", @""), self.currentJob.destURL.lastPathComponent, - p.job_cur, p.job_count, 100.0 * p.progress]; + p.pass, p.pass_count, 100.0 * p.progress]; } if (p.seconds > -1) @@ -635,7 +635,7 @@ } } - progress = (p.progress + p.job_cur - 1) / p.job_count; + progress = (p.progress + p.pass - 1) / p.pass_count; // Update dock icon if (self.dockIconProgress < 100.0 * progress) |