aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2015-01-05 01:00:13 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2015-01-05 01:00:13 -0500
commit00b515099966ed416b98789d72b955384224c27c (patch)
treebc5808aefeac492c93bd933fff5a33f4fd243a00 /MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs
parente9fd871069324ddf681b176ec2b453fe0acef44e (diff)
re-enable sync
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs')
-rw-r--r--MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs7
1 files changed, 7 insertions, 0 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs b/MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs
index 40ca08c40..c8d121eea 100644
--- a/MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs
@@ -18,6 +18,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
public class EncodingJob : IDisposable
{
public bool HasExited { get; internal set; }
+ public bool IsCancelled { get; internal set; }
public Stream LogFileStream { get; set; }
public IProgress<double> Progress { get; set; }
@@ -399,6 +400,12 @@ namespace MediaBrowser.MediaEncoding.Encoder
// job.Framerate = framerate;
+ if (!percentComplete.HasValue && ticks.HasValue && RunTimeTicks.HasValue)
+ {
+ var pct = ticks.Value/RunTimeTicks.Value;
+ percentComplete = pct*100;
+ }
+
if (percentComplete.HasValue)
{
Progress.Report(percentComplete.Value);